From: Carl Sorensen <c_sorensen@byu.edu>
Date: Sat, 16 Apr 2011 13:38:29 +0000 (-0600)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/lilypond
X-Git-Tag: release/2.15.0-1~96^2~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=698d6be49964da7b177b9fa9e7c759023d0721ba;p=lilypond.git

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

698d6be49964da7b177b9fa9e7c759023d0721ba