Merge branch 'maint'
commit256fefa9d7bcdf8f8dc4f4615c570c0f90abebd4
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 22 Sep 2015 19:33:55 +0000 (22 21:33 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 22 Sep 2015 19:33:55 +0000 (22 21:33 +0200)
tree952067c441c669e06c3bec7f1d8ef9d4b689f677
parente57a9ff926d4e6fd44eb3744a4bd058cc82bafdb
parent3e1bccc4a5206c2e61c41959174c76e9ba55c093
Merge branch 'maint'