From: Graham Percival <graham@percival-music.ca>
Date: Wed, 30 Mar 2011 16:00:37 +0000 (+0100)
Subject: Merge branch 'release/unstable'
X-Git-Tag: release/2.13.57-1~14
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5a0518e66adb5d1ebdbf523f3105adff79b1c79c;p=lilypond.git

Merge branch 'release/unstable'

Conflicts:
	Documentation/web/news-front.itexi
---

5a0518e66adb5d1ebdbf523f3105adff79b1c79c
diff --cc Documentation/web/news-front.itexi
index ffb32e19e0,d4b10d21e4..41b77d46d2
--- a/Documentation/web/news-front.itexi
+++ b/Documentation/web/news-front.itexi
@@@ -19,7 -19,7 +19,11 @@@ listed in the @qq{Changes} manual on th
  
  There are no known Critical issues with this release.  If no
  Critical bugs are found, then the official 2.14.0 release will be
++<<<<<<< HEAD
 +on April 5, 2011.  If you discover any problems, please send us
++=======
+ on April 2, 2011.  If you discover any problems, please send us
++>>>>>>> release/unstable
  @ref{Bug reports}.
  
  @newsEnd