Merge branch 'master' into 1.0 1.0.8.1
authorAlain Takoudjou <alain.takoudjou@nexedi.com>
Thu, 6 Aug 2015 09:13:33 +0000 (11:13 +0200)
committerAlain Takoudjou <alain.takoudjou@nexedi.com>
Thu, 6 Aug 2015 09:13:33 +0000 (11:13 +0200)
commit8897634306017caa0c658528eccc1e233879f1d0
treee9f71aabd367ffd70998dcc139523c435c9e14a5
parentb6e38ca48c6a42fa2eb85f2fd28d8673167e3663
parent596225bb6babd5ebdcc9cc32770d68cb6df7a399
Merge branch 'master' into 1.0