From: John Mandereau <john.mandereau@gmail.com>
Date: Sun, 7 Jan 2007 16:04:36 +0000 (+0100)
Subject: Merge with ssh+git://jomand@git.sv.gnu.org/srv/git/lilypond.git#master
X-Git-Tag: release/2.11.10-1~18^2~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=16c174dd8fc82d6fdde10af1077cc3e0bfc08b22;p=lilypond.git

Merge with ssh+git://jomand@git.sv.gnu.org/srv/git/lilypond.git#master

  No conflicts.
---

16c174dd8fc82d6fdde10af1077cc3e0bfc08b22