Merge branch 'lilypond/translation' of ssh://trettig@git.sv.gnu.org/srv/git/lilypond...
commit832fa3a90361b8a9ce8cef695f9772d844869186
authorTill Rettig <till.rettig@gmx.de>
Sun, 15 Feb 2009 13:36:08 +0000 (15 15:36 +0200)
committerTill Rettig <till.rettig@gmx.de>
Sun, 15 Feb 2009 13:36:08 +0000 (15 15:36 +0200)
tree64a5fb4df096164d6f35c26ad20694d245bf5802
parenteb7d74a9e9e454382cce6ec8f830fdce6e37dfbb
parent13d0a0dfa3d6891ea8c3b177019cdbffdf8d1ce4
Merge branch 'lilypond/translation' of ssh://trettig@git.sv.gnu.org/srv/git/lilypond into lilypond/translation

Conflicts:
Documentation/po/de.po
Documentation/po/de.po