Merge branch 'master' into ouverture
commitdfb678f65bea354889373d1fe1e674bb89a1bfd7
authorValentin Villenave <valentin@villenave.net>
Sat, 25 Dec 2010 10:58:22 +0000 (25 11:58 +0100)
committerValentin Villenave <valentin@villenave.net>
Sat, 25 Dec 2010 10:58:22 +0000 (25 11:58 +0100)
tree101f6831937a957962cca067e152094bfb71a504
parentd8bca0847dcad3dc079f079de51f574e89ecf71f
parent75985fbeba86f7829074c8fcb57fc627bd5a0baa
Merge branch 'master' into ouverture