Merge branch 'maint'
commitc78bb69a116660ca9fda01531a1d1d715bac2b1f
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 3 Dec 2016 22:58:22 +0000 (3 23:58 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 3 Dec 2016 22:58:22 +0000 (3 23:58 +0100)
tree94edd54871e4807eefbb21e927393c2d28d8cc66
parent3a4d16deab037188a12a0536ff7da10bc859d61b
parent026fb75ddbddb8b8965c40b82a381ff5b8e92516
Merge branch 'maint'