From: Carl Sorensen <c_sorensen@byu.edu>
Date: Fri, 1 May 2009 21:47:43 +0000 (-0600)
Subject: Merge branch 'master' of carldsorensen@git.sv.gnu.org:/srv/git/lilypond
X-Git-Tag: release/2.13.1-1~7^2~11^2~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2fd463683cab91b18c1d241bca208764867f1503;hp=a8a24ebc58bc28e1f8f4af3d8ea4cd5313a8ad02;p=lilypond.git

Merge branch 'master' of carldsorensen@git.sv.gnu.org:/srv/git/lilypond

Conflicts:
	Documentation/user/lilypond.tely
---