Merge branch 'master' into ouverture
commit16e7382e8b7d82618e32a976e6366aca1e86a79a
authorValentin Villenave <valentin@villenave.net>
Tue, 4 Jan 2011 09:57:56 +0000 (4 10:57 +0100)
committerValentin Villenave <valentin@villenave.net>
Tue, 4 Jan 2011 09:57:56 +0000 (4 10:57 +0100)
treeed8e071536db3f242432ded33877dc724c4d45fe
parentb34fd489e467c458e823c7b967f4d494594aca31
parentf9cc7a46d3a86904f2011ac81d70231c4055fc67
Merge branch 'master' into ouverture