Merge branch 'maint'
commit4a7b2c507253684fd87205b56f150b7691968718
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 11 Aug 2015 12:13:46 +0000 (11 14:13 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 11 Aug 2015 12:13:46 +0000 (11 14:13 +0200)
treee6f9f34433811fbf94e4b9dbe4b499843c19e578
parenta0c634ba3c3dcda86a414f2863512576354d6b24
parent9bb87f49f72de1ff7fcddc063f961d898b9f3c81
Merge branch 'maint'