Merge branch 'master' into v0.8
authorJean-Philippe Orsini <jeanfi@gmail.com>
Thu, 10 Apr 2014 06:21:03 +0000 (08:21 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Thu, 10 Apr 2014 06:21:03 +0000 (08:21 +0200)
commit88d5d4296f3504fa816545e805f88e9aa16df6fa
tree9da848b1d442358838f603c0a840f546b6da53c3
parent4e2f971f215b22026bbc390f552a15700934cb6f
parentedafcd405032b4c6f7b9ea0e6245a71b9d1da830
Merge branch 'master' into v0.8