Merge branch 'maint'
commit6b168ab03496f62317f77026711ac1a91ad815bf
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 6 Nov 2016 10:13:34 +0000 (6 11:13 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 6 Nov 2016 10:13:34 +0000 (6 11:13 +0100)
tree31d7574b9a1f46e91bdcefbeebbf45f68f051beb
parent958eacdf2294b4edd6aa797d57d4c36ada682089
parentdc3c69918f827da9d944834a5509e478a358e40c
Merge branch 'maint'