From: Francisco Vila <francisco.vila@hispalinux.es>
Date: Sat, 5 Feb 2011 07:57:55 +0000 (+0100)
Subject: Merge branch 'master' into lilypond/translation
X-Git-Tag: release/2.13.49-1~7^2~13
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=3c6c00c08ff31f57ec8d88450b4e4e7917bc4f3e

Merge branch 'master' into lilypond/translation

Conflicts:
	scripts/build/create-weblinks-itexi.py
---

3c6c00c08ff31f57ec8d88450b4e4e7917bc4f3e