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

[Jon Ciesla]

commit 54d670f755e3128e1e6fb3b980a18624b8a6a322
Merge: d25f60a 84b43bb
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Mon Jun 6 12:19:08 2011 -0500

    Merge branch 'master' into f15
    
    Conflicts:
    	lilypond-doc.spec

 .gitignore        |   15 +++++++++++++++
 lilypond-doc.spec |   51 ++++++++++++++++++++++++++++++++++++++++++++++++---
 sources           |    2 +-
 3 files changed, 64 insertions(+), 4 deletions(-)
---
diff --cc lilypond-doc.spec
index 3d749e6,806e66d..dfa1769
--- a/lilypond-doc.spec
+++ b/lilypond-doc.spec
@@@ -45,9 -45,54 +45,54 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
- * Fri Mar 11 2011 Jon Ciesla <limb at jcomserv.net> 2.13.49-2
+ * Mon Jun 06 2011 Jon Ciesla <limb at jcomserv.net> 2.14.0-1
 -- Update to 2.13.63.
++- Update to 2.14.0.
+ 
+ * Tue May 31 2011 Jon Ciesla <limb at jcomserv.net> 2.13.63-1
+ - Update to 2.13.63.
+ 
+ * Fri May 27 2011 Jon Ciesla <limb at jcomserv.net> 2.13.62-1
+ - Update to 2.13.62.
+ 
+ * Mon May 02 2011 Jon Ciesla <limb at jcomserv.net> 2.13.61-1
+ - Update to 2.13.61.
+ 
+ * Mon Apr 18 2011 Jon Ciesla <limb at jcomserv.net> 2.13.60-1
+ - Update to 2.13.60.
+ 
+ * Mon Apr 11 2011 Jon Ciesla <limb at jcomserv.net> 2.13.59-1
+ - Update to 2.13.59.
+ 
+ * Thu Apr 07 2011 Jon Ciesla <limb at jcomserv.net> 2.13.58-1
+ - Update to 2.13.58.
+ 
+ * Mon Apr 04 2011 Jon Ciesla <limb at jcomserv.net> 2.13.57-1
+ - Update to 2.13.57.
+ 
+ * Thu Mar 31 2011 Jon Ciesla <limb at jcomserv.net> 2.13.56-1
+ - Update to 2.13.56.
+ 
+ * Mon Mar 25 2011 Jon Ciesla <limb at jcomserv.net> 2.13.55-1
+ - Update to 2.13.55.
+ 
+ * Mon Mar 14 2011 Jon Ciesla <limb at jcomserv.net> 2.13.54-1
+ - Update to 2.13.54.
+ 
+ * Fri Mar 11 2011 Jon Ciesla <limb at jcomserv.net> 2.13.53-2
  - Fixed license tag, BZ 684215.
  
+ * Tue Mar 08 2011 Jon Ciesla <limb at jcomserv.net> 2.13.53-1
+ - Update to 2.13.53.
+ 
+ * Wed Mar 02 2011 Jon Ciesla <limb at jcomserv.net> 2.13.52-1
+ - Update to 2.13.52.
+ 
+ * Fri Feb 25 2011 Jon Ciesla <limb at jcomserv.net> 2.13.51-1
+ - Update to 2.13.51.
+ 
+ * Mon Feb 14 2011 Jon Ciesla <limb at jcomserv.net> 2.13.50-1
+ - Update to 2.13.50.
+ 
  * Thu Feb 10 2011 Jon Ciesla <limb at jcomserv.net> 2.13.49-1
  - Update to 2.13.49.