Merge branch 'master' into ouverture
commit39dafbb0c894a8f4b2f189cdb5bd86027ac09884
authorValentin Villenave <valentin@villenave.net>
Wed, 13 Oct 2010 22:05:50 +0000 (14 00:05 +0200)
committerValentin Villenave <valentin@villenave.net>
Wed, 13 Oct 2010 22:05:50 +0000 (14 00:05 +0200)
tree84105f8576aa0c4cfc5efc273157a407cb16d920
parent99842a883e15270f8a0cec3a788863a604d38d1f
parenteac8ba41cd0d888c5ba2d946ef8115049b2df867
Merge branch 'master' into ouverture