Merge branch 'maint'master
commit5e3fe91b7c6da14fe6d9cf0876339d4d503cf052
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 8 Dec 2016 21:42:44 +0000 (8 22:42 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 8 Dec 2016 21:42:44 +0000 (8 22:42 +0100)
tree81843ccaa4b67d1f13eaceb49960e2e88d5a5a59
parent53d11dc51d6bb0681bf899b4c53deae93d8fd417
parente32aca36a47306240087a423de8829a8eb3a3980
Merge branch 'maint'