Merge branch 'master' into ballade
commit301d0a375519b44fc81b0d3de30b601dbcd43767
authorValentin Villenave <valentin@villenave.net>
Sun, 26 Dec 2010 19:17:31 +0000 (26 20:17 +0100)
committerValentin Villenave <valentin@villenave.net>
Sun, 26 Dec 2010 19:17:31 +0000 (26 20:17 +0100)
treea5da2acc6b6c3f12f59d5aa35acd242f4f5654ef
parent53a6976a4812b2ba87332a4c9734fb753e625caa
parentbd5cf4d6ca6fbade9b143ba1326a9b10f0c941b3
Merge branch 'master' into ballade