From: John Mandereau <john.mandereau@gmail.com>
Date: Tue, 17 Jul 2012 20:49:58 +0000 (+0200)
Subject: Merge branch 'master' into staging
X-Git-Tag: release/2.15.42-1~57
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ebc3cdab150ac7de7857043d301f784fd0f8aecc;p=lilypond.git

Merge branch 'master' into staging

Conflicts:
	Documentation/snippets/new/incipit.ly
---

ebc3cdab150ac7de7857043d301f784fd0f8aecc