Merge branch 'master' into 1.0 1.0.7
authorAlain Takoudjou <alain.takoudjou@nexedi.com>
Tue, 28 Jul 2015 15:39:34 +0000 (17:39 +0200)
committerAlain Takoudjou <alain.takoudjou@nexedi.com>
Tue, 28 Jul 2015 15:39:34 +0000 (17:39 +0200)
commit33d4c0724c22602b4188b31a040dddf3b32858bc
treee6cc8d4f5ff053de3984ff91b403c074d61d9e15
parentafc6eb889b5a30814731c1c3f995882ce10ff887
parenta7cf2ea1cdaf201a9fa57952efa26b9661bcb12e
Merge branch 'master' into 1.0