]> git.donarmstrong.com Git - lilypond.git/commitdiff
Merge branch 'master' into staging
authorJohn Mandereau <john.mandereau@gmail.com>
Tue, 17 Jul 2012 20:49:58 +0000 (22:49 +0200)
committerJohn Mandereau <john.mandereau@gmail.com>
Tue, 17 Jul 2012 20:49:58 +0000 (22:49 +0200)
Conflicts:
Documentation/snippets/new/incipit.ly


Trivial merge