Merge branch 'master' into re6st-master
authorAlain Takoudjou <talino@tiolive.com>
Tue, 14 Apr 2015 16:07:20 +0000 (18:07 +0200)
committerAlain Takoudjou <talino@tiolive.com>
Tue, 14 Apr 2015 16:07:20 +0000 (18:07 +0200)
commitc165673e09979d8cc7e85d4fd33d85ee7f31ac2e
treef9e3b00036b3778ea159e6c604774c20f475ceb1
parenta4f1aa8890c98a92e0e6aa82e3157efaf39f3620
parent6ea277642ab4eab91ced4a222ed26eac10672247
Merge branch 'master' into re6st-master