Merge branch 'master' into ballade
commit5d3eae04ca6e30a4e6a3c53393f2d85d0bcc56b8
authorValentin Villenave <valentin@villenave.net>
Wed, 17 Nov 2010 18:40:41 +0000 (17 19:40 +0100)
committerValentin Villenave <valentin@villenave.net>
Wed, 17 Nov 2010 18:40:41 +0000 (17 19:40 +0100)
treea302047a25da7e5cd42832c7914d22470e3dc5e5
parentf527fed9b132ed3e9203812b49380ae3b10ecf2a
parent80d20da8da369851841d20082579de5470b60df0
Merge branch 'master' into ballade