Merge git://repo.or.cz/opera_libre
commit7597b388510010ed2b787f1b60dccc35097f989a
authorValentin <v.villenave@gmail.com>
Sat, 3 Jan 2009 01:51:48 +0000 (3 02:51 +0100)
committerValentin <v.villenave@gmail.com>
Sat, 3 Jan 2009 01:51:48 +0000 (3 02:51 +0100)
tree65a4473c3de26df9a2bea081a6571fe924a88add
parent1d0711a53b9fcd35bdefeb4e0f24ac3d713dd794
parentfbcb3419af6e5aef27707c4778234da09a0db2fc
Merge git://repo.or.cz/opera_libre

Conflicts:
master/master.ly
instruments/flute1.ly
instruments/flute2.ly
master/master.ly