Merge branch 'master' into 1.0 1.0.5
authorAlain Takoudjou <alain.takoudjou@nexedi.com>
Fri, 24 Jul 2015 12:13:56 +0000 (14:13 +0200)
committerAlain Takoudjou <alain.takoudjou@nexedi.com>
Fri, 24 Jul 2015 12:13:56 +0000 (14:13 +0200)
commit6651971a3b1f036a999200c71eb4a7b6d98a6201
treea5736598e0c0cea034c7aef18726d183dd1405ca
parent165619c154c33a5949fd2a81d35dd1b0dc842e17
parentae2700444da119ca371b3aab6b14b34bd0b3b559
Merge branch 'master' into 1.0