Merge branch 'master' into v0.8
authorJean-Philippe Orsini <jeanfi@gmail.com>
Wed, 9 Apr 2014 23:59:44 +0000 (01:59 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Wed, 9 Apr 2014 23:59:44 +0000 (01:59 +0200)
commit4e2f971f215b22026bbc390f552a15700934cb6f
tree83903b9132a250ddc3dcaf02be1241b12b632d96
parenta5d102939f3b7eee38e67543318d7921a3e1d8ee
parent86c1c0b40d188d79ded57131e93c9138abceea07
Merge branch 'master' into v0.8