Merge branch 'master' into ouverture
commit99842a883e15270f8a0cec3a788863a604d38d1f
authorValentin Villenave <valentin@villenave.net>
Fri, 8 Oct 2010 14:53:22 +0000 (8 16:53 +0200)
committerValentin Villenave <valentin@villenave.net>
Fri, 8 Oct 2010 14:53:22 +0000 (8 16:53 +0200)
treeecb7465bdd856a9b22dc84f39af212df912b6184
parent85b947c22541992434214936a27766ff10345422
parent946584db8ba332c7d0026cbdd0bbd2846aebaea5
Merge branch 'master' into ouverture