Merge branch 'maint'
commit4bc8008e8b527a9dd1564eb7ec36a2ec4ca51331
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 23 Aug 2015 21:44:18 +0000 (23 23:44 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 23 Aug 2015 21:44:18 +0000 (23 23:44 +0200)
tree467870db080afdbfd143ac8df17b6e34fd9fa1eb
parent4f8d40dc33b2ce8c4d55453ac56aa6d86e98126e
parent6626dfb30bea8fa7bcb760f0265dc3c7422cc1e4
Merge branch 'maint'