Merge git://repo.or.cz/opera_libre
commit24bf208e5f146cb65066e399b831f2bf05b4cb76
authorValentin Villenave <v.villenave@gmail.com>
Wed, 7 Jan 2009 06:48:18 +0000 (7 07:48 +0100)
committerValentin Villenave <v.villenave@gmail.com>
Wed, 7 Jan 2009 06:48:18 +0000 (7 07:48 +0100)
treef699373b15632ef0f82f69b17143cfa596d40c31
parent4df63a1443e26c36034a61da78d58af8867d8e66
parent65829e9f1043ee7737c593b27770615a45cfffaf
Merge git://repo.or.cz/opera_libre

Conflicts:
instruments/violon3.ly
instruments/alto1.ly
instruments/alto2.ly
instruments/contrebasse.ly
instruments/violon1.ly
instruments/violon2.ly
instruments/violon3.ly
instruments/violoncelle1.ly
instruments/violoncelle2.ly