Merge branch 'master' into ballade
commit53a6976a4812b2ba87332a4c9734fb753e625caa
authorValentin Villenave <valentin@villenave.net>
Sun, 26 Dec 2010 18:25:28 +0000 (26 19:25 +0100)
committerValentin Villenave <valentin@villenave.net>
Sun, 26 Dec 2010 18:25:28 +0000 (26 19:25 +0100)
treed21c787c42e0481c6795881164bf511fd71350b3
parentcd7ca34f77c4ac13fe5aaba1f0d2ec8c4bbc1bec
parent7050ccd5d74158c5e2d3e8ffa30a62462dbf4411
Merge branch 'master' into ballade