Merge branch 'maint'
commit410ea62fc86ff8a2afc0183eba430b4de79df231
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 1 Sep 2015 08:32:26 +0000 (1 10:32 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 1 Sep 2015 08:32:26 +0000 (1 10:32 +0200)
tree849c0614492f8d9cd5d56b3a051f31794bb83a38
parent0d012266332b68d86350bb5ea1020b2e1dce55a1
parent2d62c0e173dabc4ef1eb5172ceae32407e6049be
Merge branch 'maint'