]> git.donarmstrong.com Git - lilypond.git/commit
Merge branch 'master' into lilypond/translation
authorFrancisco Vila <francisco.vila@hispalinux.es>
Thu, 18 Nov 2010 17:44:01 +0000 (18:44 +0100)
committerFrancisco Vila <francisco.vila@hispalinux.es>
Thu, 18 Nov 2010 17:48:53 +0000 (18:48 +0100)
commit23a1ad9c2dca3c5fa3e14b2ec5640c1d745d18d8
treec65dbfd10f20d8e51567ca96b5d6a78e24b2ea01
parent6db643ee564700bac377055218397c8655b23665
parent528f153a5fcafb0bf6cd2b5fe8eaf28341218d38
Merge branch 'master' into lilypond/translation

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