Merge origin/master
authorFulup Ar Foll <fulup@iot.bzh>
Mon, 21 Dec 2015 15:35:09 +0000 (16:35 +0100)
committerFulup Ar Foll <fulup@iot.bzh>
Mon, 21 Dec 2015 15:35:09 +0000 (16:35 +0100)
commite76dff6729fb9acd1638019507e7edbbd8af23f5
treea7c3b0e35b3ac516bbaadf7f5448a0a9799c312f
parent5472e85501418302959040eacb819c57f849d63e
parent5bad34ac9278831eb65499c8aa887116aafa33b2
Merge origin/master