[lilypond-doc/f15: 2/2] Merge branch 'f16' into f15

[Jon Ciesla]

commit 94b9a786ebc913975c908f10adfa72df53802d6c
Merge: 30ce230 7803c4e
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Thu Jul 28 10:46:25 2011 -0500

    Merge branch 'f16' into f15

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