Merge branch 'master' into ballade
commitf527fed9b132ed3e9203812b49380ae3b10ecf2a
authorValentin Villenave <valentin@villenave.net>
Wed, 17 Nov 2010 10:39:42 +0000 (17 11:39 +0100)
committerValentin Villenave <valentin@villenave.net>
Wed, 17 Nov 2010 10:39:42 +0000 (17 11:39 +0100)
tree0a6c4baeab1830936dc19c3ef697ff8d39759dc7
parent8381c3dfbbfbd4949c1cce7008507b890fa359e2
parent16ac1e6768399446c7da37557525392c2ea3e8ba
Merge branch 'master' into ballade