Merge branch 'master' into ouverture
commitd8bca0847dcad3dc079f079de51f574e89ecf71f
authorValentin Villenave <valentin@villenave.net>
Fri, 24 Dec 2010 08:50:20 +0000 (24 09:50 +0100)
committerValentin Villenave <valentin@villenave.net>
Fri, 24 Dec 2010 08:50:20 +0000 (24 09:50 +0100)
tree5d81b2a40981f0f54c8d3f1b3d7ec9db4fe99e4d
parent3c389ead018929da6e1bc40a0cfce8ae4feaf6dc
parent43ffdcdb1c2cb8c125d06ee4248e1a5f22f548d5
Merge branch 'master' into ouverture