Merge branch 'master' into sonate
commitbe5062ed977c578586d5e4545aaad2b2672763d0
authorValentin Villenave <valentin@villenave.net>
Wed, 11 Apr 2012 20:40:00 +0000 (11 22:40 +0200)
committerValentin Villenave <valentin@villenave.net>
Wed, 11 Apr 2012 20:40:00 +0000 (11 22:40 +0200)
treeccb796738d0bee72777d681c75cd977634baf0da
parent44f17a59cfe89f76f7b309078530445d2a729865
parentc9b941946dab1e4f2a8f99a755216837bdd09782
Merge branch 'master' into sonate