Merge branch 'maint'
commit345449d088e473a4d6fd1604227b7bb767def419
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 27 Nov 2016 22:09:48 +0000 (27 23:09 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 27 Nov 2016 22:09:48 +0000 (27 23:09 +0100)
tree9e009d8be690c494a85d948cc7f10c988f0e19f9
parent8887e1de1c0795ae9e35d230a3b407da4b40e804
parent4b99ed5eb095a52d65eb289831b857733d5925f7
Merge branch 'maint'