Merge branch 'maint'
commit0fa05a60eb546373bf5a62d9a2e1ba318d316316
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 26 Aug 2015 12:13:59 +0000 (26 14:13 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 26 Aug 2015 12:13:59 +0000 (26 14:13 +0200)
treecb6f298ead09b4fe198a1dc77dd6770b3c051597
parentc160ae204e2186eb099a5eac70c60422becf1129
parent6ddde6132bd7860cc240669c3805b69b8b2094aa
Merge branch 'maint'