Merge branch 'master' into ouverture
commit8fd8a0d25b7d41ceb36ed4ebeb45644f7772664d
authorValentin Villenave <valentin@villenave.net>
Thu, 23 Dec 2010 21:27:15 +0000 (23 22:27 +0100)
committerValentin Villenave <valentin@villenave.net>
Thu, 23 Dec 2010 21:27:15 +0000 (23 22:27 +0100)
tree06f8f2a2b0b7f669888ce57de30d83bdeade7ea1
parentc9d4fce0205f19e88514ea3ba5e656e7c9909317
parent01ef1e0a029855216102a3efef44efb2b31c544a
Merge branch 'master' into ouverture