From: Graham Percival <graham@percival-music.ca>
Date: Mon, 5 Jul 2010 08:06:41 +0000 (+0100)
Subject: Merge commit 'origin' into release/unstable
X-Git-Tag: release/2.13.27-1~4^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3e7e6ba175c54365ec727824d7c75ee85e00e875;p=lilypond.git

Merge commit 'origin' into release/unstable

Conflicts:
	input/regression/lilypond-book/include.ly
	input/regression/lilypond-book/include2.ly

oops.
---

3e7e6ba175c54365ec727824d7c75ee85e00e875