From: Francisco Vila <francisco.vila@hispalinux.es>
Date: Wed, 7 Mar 2012 09:23:11 +0000 (+0100)
Subject: Merge branch 'lilypond/translation' into staging
X-Git-Tag: release/2.15.33-1~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9d1520b21710bd22872010ae9aa4c4899014e9d4;p=lilypond.git

Merge branch 'lilypond/translation' into staging

Conflicts:
	Documentation/changes.tely
	Documentation/translations.itexi
	Documentation/web/news-front.itexi
	VERSION
	input/regression/layout-from.ly
	lily/context-def.cc
---

9d1520b21710bd22872010ae9aa4c4899014e9d4
diff --cc Documentation/translations.itexi
index 5f854b6d02,937a88bd4b..1377436f87
--- a/Documentation/translations.itexi
+++ b/Documentation/translations.itexi
@@@ -16,8 -16,8 +16,7 @@@ td { border: 1px solid black; text-alig
  
  @end html
  @end ifhtml
- @emph{Last updated Thu Mar  1 13:47:50 UTC 2012
 -@emph{Last updated Sat Feb 25 23:32:38 UTC 2012
--}
++@emph{Last updated Thu Mar  1 13:47:50 UTC 2012}
  @multitable @columnfractions  0.5 0.5
  
  @headitem