Merge branch 'maint'
commit4d0609f8af0db7248fa5f8eb2b69ee02665e8cbd
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 17 Jan 2017 11:02:02 +0000 (17 12:02 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 17 Jan 2017 11:02:02 +0000 (17 12:02 +0100)
tree760cb1cb19bad38f7b92287faf5db668c6863f13
parentc1c510ffe05e646985cdfa033d15a7076b846dad
parentd2af251077cf041dfe9acf76542f6fc41f5b1dda
Merge branch 'maint'