Merge branch 'ballade' of git+ssh://git.sv.gnu.org/srv/git/opus-libre
commit1f6a76263d008365c9af16dde200954ac14d8259
authorValentin Villenave <valentin@villenave.net>
Mon, 20 May 2013 16:58:56 +0000 (20 18:58 +0200)
committerValentin Villenave <valentin@villenave.net>
Mon, 20 May 2013 16:58:56 +0000 (20 18:58 +0200)
tree17d647e76e0bad56e2fd7878034a0ebad9f36487
parent783baf426aa39488942e11ffe75823c4045e57bd
parentc1140fe77500e2c715fe07d064fcbf6ed6e4bbb5
Merge branch 'ballade' of git+ssh://git.sv.gnu.org/srv/git/opus-libre