Merge branch 'master' into sonate
commitc2943fb21315ae67c4574e1c608d3e4bddd8f5ac
authorValentin Villenave <valentin@villenave.net>
Tue, 17 Apr 2012 07:46:38 +0000 (17 09:46 +0200)
committerValentin Villenave <valentin@villenave.net>
Tue, 17 Apr 2012 07:46:38 +0000 (17 09:46 +0200)
tree2670b6ec88fd3a913c1e028c13fa1c588820a53e
parent27212dfd106620118f601cf71fc4c06deab1d216
parentea9129f109f1c93c1eadb7c30925f31660cc2538
Merge branch 'master' into sonate