Merge branch 'maint'
commit5565645f7591c4bc46d9ba8179c1e344550e556d
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 13 Oct 2015 19:44:13 +0000 (13 21:44 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 13 Oct 2015 19:44:13 +0000 (13 21:44 +0200)
treeeb8962e5549140dffea011e2c880365a529d51ab
parent346d2272287b55a7a75d3555de98499d97e6a85a
parentd183c59e46dc2779d22f08d6387d482d0e3dd29d
Merge branch 'maint'