Merge branch 'maint'
commit768e66fb37aa6f41377f482a874f8788973eebb1
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 6 Dec 2016 23:16:05 +0000 (7 00:16 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 6 Dec 2016 23:16:05 +0000 (7 00:16 +0100)
treeac5323cea97f2f4aaaeb94c82dcdb9faffd3ac9a
parentd65aa337ae92c0a653734d7216ed57bcb97540aa
parent6ed3fc8010bd81b49f68b467b464b4365a55cf70
Merge branch 'maint'