Merge branch 'master' into ballade
commitcd7ca34f77c4ac13fe5aaba1f0d2ec8c4bbc1bec
authorValentin Villenave <valentin@villenave.net>
Tue, 21 Dec 2010 19:08:47 +0000 (21 20:08 +0100)
committerValentin Villenave <valentin@villenave.net>
Tue, 21 Dec 2010 19:08:47 +0000 (21 20:08 +0100)
tree4fdd710db0f25ba577b44df13d957934058b8e47
parent544727b506039b47dea997e965314a89e327f312
parentbaa1692d38a0c89fedcb6cd8ff4c52646ed0acc8
Merge branch 'master' into ballade