Merge branch 'master' into 1.0 1.0.10
authorAlain Takoudjou <alain.takoudjou@nexedi.com>
Tue, 18 Aug 2015 09:17:46 +0000 (11:17 +0200)
committerAlain Takoudjou <alain.takoudjou@nexedi.com>
Tue, 18 Aug 2015 09:17:46 +0000 (11:17 +0200)
commitaf7d7839e942a4adbde527400713d4250bafabb1
tree2f7b419a2b66fb210adb007d4ce7c2f6b371a440
parent322415c1181d57563045ba5500fe8bb56b792e4a
parentb8d4cc970320dd739c66d0f0b8bfa1a69444a2fd
Merge branch 'master' into 1.0