Merge branch 'maint'
commit9a04a1557c283c3ece5db8f0f298b0b56598820b
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 1 Jul 2015 12:44:48 +0000 (1 14:44 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 1 Jul 2015 12:44:48 +0000 (1 14:44 +0200)
treecd7569fafadf9ac6af2e8dc9dc0f216c948664ab
parent304f84530b276b72272c37aa3e4dfded4584d709
parent2e1bc42db828d11a63354c3c57eed34b7f59921f
Merge branch 'maint'