Merge branch 'maint'
commit57a8dde8e3a19cd3b2effad149f96abf0302c8eb
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 24 Dec 2017 23:14:51 +0000 (25 00:14 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 24 Dec 2017 23:14:51 +0000 (25 00:14 +0100)
treeb40b59d9921a9984d87dd6bb097c2855920da422
parent2262d0d0c3c35f04c011874e9ae17f4e7f1476d7
parentb3ddb051e667bdc2daf6e6d9ba4742a56b54d449
Merge branch 'maint'