Merge branch 'master' into 1.0 1.0.8
authorAlain Takoudjou <alain.takoudjou@nexedi.com>
Mon, 3 Aug 2015 07:44:49 +0000 (09:44 +0200)
committerAlain Takoudjou <alain.takoudjou@nexedi.com>
Mon, 3 Aug 2015 07:44:49 +0000 (09:44 +0200)
commit71523d60895cf4e64f3a49ec7cffa5c6ead9db17
tree4ca9c9da6f902cb5dd0515c628df32fb7ea9fc0e
parent33d4c0724c22602b4188b31a040dddf3b32858bc
parent6d65a74e608ae709952371e137edb50f57b431e8
Merge branch 'master' into 1.0