From: Graham Percival <graham@percival-music.ca>
Date: Sat, 18 Jun 2011 13:22:33 +0000 (+0100)
Subject: Merge remote branch 'origin' into release/unstable
X-Git-Tag: release/2.15.2-1~2
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=904b46b9fa8fc5c189087058cdf977383a4580d7;p=lilypond.git

Merge remote branch 'origin' into release/unstable

Conflicts:
	Documentation/web/news-front.itexi
---

904b46b9fa8fc5c189087058cdf977383a4580d7