Merge remote-tracking branch 'lab/master'
authorAlain Takoudjou <alain.takoudjou@nexedi.com>
Mon, 17 Aug 2015 16:46:11 +0000 (18:46 +0200)
committerAlain Takoudjou <alain.takoudjou@nexedi.com>
Mon, 17 Aug 2015 16:46:11 +0000 (18:46 +0200)
commit72d9060351571ddb10c3db64628b00110ba3f3a0
tree4551ebeec94f274f49e9a3a1067c37e796e44949
parentea24a23f440a8e0c09360fad8aaee6db24d338c8
parentc370722f3d3ad0b844174c9a427e132163c98ff9
Merge remote-tracking branch 'lab/master'