[lilypond-doc/f15: 3/3] Merge branch 'master' into f15

[Jon Ciesla]

commit 30ce2302e82665ed5cbb916eef0a0eb9966e93be
Merge: 54d670f 0321092
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Mon Jun 27 13:39:52 2011 -0500

    Merge branch 'master' into f15

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