Merge branch 'maint'
commitaa15dc182097f38da800922ce5035b272cbe06c2
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 27 Nov 2016 22:46:13 +0000 (27 23:46 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 27 Nov 2016 22:46:13 +0000 (27 23:46 +0100)
treebfe702a953e9b92ed865b7a527dfcb303dae0ab7
parent345449d088e473a4d6fd1604227b7bb767def419
parent690776691314264849714f1e0bd127b0bd846e8d
Merge branch 'maint'