From a5f0be10ff191426a148056afb6fc6c6d02901b5 Mon Sep 17 00:00:00 2001
From: Jon Ciesla <limb@jcomserv.net>
Date: Jul 28 2011 15:46:54 +0000
Subject: Merge branch 'f15' into f14


---

diff --git a/.gitignore b/.gitignore
index ab4f053..12403a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ lilypond-2.12.3.tar.gz
 /lilypond-2.13.63.tar.gz
 /lilypond-2.14.0.tar.gz
 /lilypond-2.14.1.tar.gz
+/lilypond-2.14.2.tar.gz
diff --git a/lilypond.spec b/lilypond.spec
index cdf3223..c7641d1 100644
--- a/lilypond.spec
+++ b/lilypond.spec
@@ -1,5 +1,5 @@
 Name:		lilypond
-Version:	2.14.1
+Version:	2.14.2
 Release:	1%{?dist}
 Summary:	A typesetting system for music notation
 
@@ -240,6 +240,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul 28 2011 Jon Ciesla <limb@jcomserv.net> - 2.14.2-1
+- New upstream.
+
 * Mon Jun 13 2011 Jon Ciesla <limb@jcomserv.net> - 2.14.1-1
 - New upstream.
 
diff --git a/sources b/sources
index 70eda59..b6c5651 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-262cc7f92c907a7b479b55b3b37a9302  lilypond-2.14.1.tar.gz
+4053a19e03181021893981280feb9aaa  lilypond-2.14.2.tar.gz