Merge branch 'maint'
commita0c634ba3c3dcda86a414f2863512576354d6b24
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 10 Aug 2015 21:24:06 +0000 (10 23:24 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 10 Aug 2015 21:24:06 +0000 (10 23:24 +0200)
treedf238bb4c539930161a0012dd43d0190d2bd70bb
parente658b07c8aa2a73635d94b958c992e9f60515c31
parentac0661189ee10b15c7296072f50de3af0b21ebdc
Merge branch 'maint'