Merge branch 'maint'
commit28f6fa844d80e5689ab059e1f093b110adde4ee0
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 29 Nov 2016 22:56:50 +0000 (29 23:56 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 29 Nov 2016 22:56:50 +0000 (29 23:56 +0100)
treecd2968cb4252acd6d15c90509d8e23bbca5c92d2
parente53452c76c1abae064bfe49efe345f9dea3e3b3f
parentba06303016ef84ca21311201478393e695a9dc3f
Merge branch 'maint'