Merge branch 'master' into ouverture
commitb00769691ec4551be679b5cabb097923acb68de6
authorValentin Villenave <valentin@villenave.net>
Thu, 23 Dec 2010 10:27:04 +0000 (23 11:27 +0100)
committerValentin Villenave <valentin@villenave.net>
Thu, 23 Dec 2010 10:27:04 +0000 (23 11:27 +0100)
tree90adbbac20e41ad7210aa4d4fd4751a897eb527a
parent6534d0055f9bfefdd4dfaf4eeacdc514792e86c4
parentaf00a18d1c087945e747fd07a6a0047d888c2504
Merge branch 'master' into ouverture