Merge branch 'master' into ballade
commitfd7e3d18bda5b1722f79bab8101806fa94497fd2
authorValentin Villenave <valentin@villenave.net>
Mon, 27 Dec 2010 12:45:01 +0000 (27 13:45 +0100)
committerValentin Villenave <valentin@villenave.net>
Mon, 27 Dec 2010 12:45:01 +0000 (27 13:45 +0100)
tree3d9cecb18cdb10f4590eaaaaa147e8bff83f436a
parent301d0a375519b44fc81b0d3de30b601dbcd43767
parent4831f54b3e817a1e85bfb146b8f782b6df5f414b
Merge branch 'master' into ballade