Merge branch 'master' into ouverture
commit53c5286f8f710742ec09dab4da119e64dd9c58e6
authorValentin Villenave <valentin@villenave.net>
Mon, 25 Oct 2010 20:50:58 +0000 (25 22:50 +0200)
committerValentin Villenave <valentin@villenave.net>
Mon, 25 Oct 2010 20:50:58 +0000 (25 22:50 +0200)
tree5e03c3d4f6a9bfa7f50ec5849b0987590acf1c09
parent34f531387e9d9ffe7579f72f2b6aa7f78d8756e7
parentdfd34393fcf4301c6fcd67d2533d60161b9be4b6
Merge branch 'master' into ouverture