Merge branch 'maint'
commit1f3c6c2f49a3c6e38c246e6d639da2c11cb6ce6c
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 4 Sep 2014 20:15:04 +0000 (4 22:15 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 4 Sep 2014 20:15:04 +0000 (4 22:15 +0200)
tree864a5a180245c69326865d09e3735f4cf1551276
parent9798a5d524d541a3e51fc41ee8c372bab53fa883
parent4b9146cd68c588a46a04d2b5df52c18bef8ad895
Merge branch 'maint'