Merge branch 'maint'
commit77c8fff219d4a55c5d05b6ae7b13eb08cd0c59d3
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 21 Aug 2015 22:59:16 +0000 (22 00:59 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 21 Aug 2015 22:59:16 +0000 (22 00:59 +0200)
treec68aaee803787529309a76575373c91499b5168b
parente4cb4419152b9f894d78082e9e26bea2fbaad2b8
parent3a6c9f5f06c6c697f43561b39ad87bda31db1c62
Merge branch 'maint'