Merge branch 'maint'
commit2064b0a3933621a7d9db368454053aba4fa2ccc0
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 5 Feb 2017 08:23:12 +0000 (5 09:23 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 5 Feb 2017 08:23:12 +0000 (5 09:23 +0100)
treecf89a7f288d4677c4a870a73c44ed94be380658e
parent693bda9e5c876b9cb00c3a35ee84413f119d4b7b
parent3dc4fa9d9d05e0c52bc289675925c101f801bd44
Merge branch 'maint'