Merge branch 'master' into sonate
commit6d4f59455b5cb339b2f5b6b8191229c84c1cf55e
authorValentin Villenave <valentin@villenave.net>
Tue, 17 Apr 2012 13:59:46 +0000 (17 15:59 +0200)
committerValentin Villenave <valentin@villenave.net>
Tue, 17 Apr 2012 13:59:46 +0000 (17 15:59 +0200)
treed482122c449c10654fd6ce7cdb5657f2ea90dfc6
parentc2943fb21315ae67c4574e1c608d3e4bddd8f5ac
parent5fa17ea959ad1bd6267c2bcc1e19d53f565baed3
Merge branch 'master' into sonate