From: David Kastrup <dak@gnu.org>
Date: Tue, 5 Nov 2013 02:41:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/release/unstable' into HEAD
X-Git-Tag: release/2.17.96-1~29
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b9d3aec07415ad5e7ad024aa7d73e5c5bfabc82d;p=lilypond.git

Merge remote-tracking branch 'origin/release/unstable' into HEAD

Conflicts:
	VERSION
---

b9d3aec07415ad5e7ad024aa7d73e5c5bfabc82d