Merge branch 'maint'
commit6ea46c7257c33f213b20e31fe7159a5ca1860e09
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 13 Nov 2016 10:38:09 +0000 (13 11:38 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 13 Nov 2016 10:38:09 +0000 (13 11:38 +0100)
treeec26de2417407a605d37f836420dfc5d1707ed56
parent3375671e838ed4bfe9bec1ea233b340fa2d16646
parentcec084584d88b41b83e71a98484a7d16fb23d699
Merge branch 'maint'