Merge branch 'master' into ouverture
commit0be271e0d6b5920b16cce3a66d1745900c94ea33
authorValentin Villenave <valentin@villenave.net>
Sun, 3 Oct 2010 15:37:52 +0000 (3 17:37 +0200)
committerValentin Villenave <valentin@villenave.net>
Sun, 3 Oct 2010 15:37:52 +0000 (3 17:37 +0200)
tree507dd03524d5145ddeb87dad5bd3ace2145ee1dc
parent6e3e766ac1ad02145ddaf3d3b05b2f2f1e1d631a
parentca5235fb2d419e41393e612567dd1c51c19e2e5b
Merge branch 'master' into ouverture