Merge branch 'maint'
commitd82811a4f9db6d2bbb9f25559e854ee3c18fda2a
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 25 Nov 2016 00:54:14 +0000 (25 01:54 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 25 Nov 2016 00:54:14 +0000 (25 01:54 +0100)
tree2e1aa1c61a2e280eee234d4dc53ae030fc3d1c3b
parenta43eaccfce3b25999d91349f2c00b209970693ab
parent69ec6258b65a5d317f0dcb275ec2d5a90f72f191
Merge branch 'maint'