From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 28 Dec 2008 17:26:23 +0000 (-0200)
Subject: Merge branch 'stable'
X-Git-Tag: release/2.12.1-1~16^2~3
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=d664f5a7153ec2b1a1c4c9fba2d2174bf3140695

Merge branch 'stable'

Conflicts:
	VERSION
---

d664f5a7153ec2b1a1c4c9fba2d2174bf3140695