[lilypond/f14: 3/3] Merge branch 'f15' into f14

[Jon Ciesla]

commit a5f0be10ff191426a148056afb6fc6c6d02901b5
Merge: 1aa5f57 beb81cc
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Thu Jul 28 10:46:54 2011 -0500

    Merge branch 'f15' into f14

 .gitignore    |    1 +
 lilypond.spec |    5 ++++-
 sources       |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---