From: Phil Holmes <mail@philholmes.net>
Date: Sun, 20 Oct 2013 14:51:31 +0000 (+0100)
Subject: Merge remote branch 'origin/master' into release/unstable
X-Git-Tag: release/2.17.29-1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6120178d90fd69aadffb0f5062566da0993bba9d;p=lilypond.git

Merge remote branch 'origin/master' into release/unstable
---

e6bc480ff17d5506a6821a29cf9c839797d665a4