Merge remote-tracking branch 'lab/master' into HEAD
authorAlain Takoudjou <alain.takoudjou@nexedi.com>
Fri, 4 Dec 2015 17:04:26 +0000 (18:04 +0100)
committerAlain Takoudjou <alain.takoudjou@nexedi.com>
Fri, 4 Dec 2015 17:04:26 +0000 (18:04 +0100)
commitb9b59cf9a49397b9cfae825cfd307c00000dc8f4
treeeefc3c5cc8787c4b4b1312cfd0916d51015cb21c
parentf570ca1e98077ce176090bc21fbe49a64af22c2a
parent984c2f9a0cad4bed675bfe4945edddbd06ab9a93
Merge remote-tracking branch 'lab/master' into HEAD