Merge branch 'maint'
commit36468b90dbbff033b740d641c42c4aa5e7efc14c
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 11 Aug 2015 22:58:53 +0000 (12 00:58 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 11 Aug 2015 22:58:53 +0000 (12 00:58 +0200)
tree84d7a5b47d1f0038feece29d519718d823ad90b4
parent3add787abd01efcca029d65e97f828823205286a
parent06026a16f9a5990d585bf0e14c42df6e57a961f2
Merge branch 'maint'