From: David Kastrup <dak@gnu.org>
Date: Thu, 10 Jan 2013 20:59:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into translation
X-Git-Tag: release/2.17.11-1~7^2~39
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2f7fe0c6bc80ad57ae73e213f9b20bc9719ba2ce;p=lilypond.git

Merge remote-tracking branch 'origin/master' into translation
---

2f7fe0c6bc80ad57ae73e213f9b20bc9719ba2ce