Merge branch 'maint'
commit9f3a026e5773592d260a14910e09215eb1a3a83f
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 15 Mar 2017 13:32:24 +0000 (15 14:32 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 15 Mar 2017 13:32:24 +0000 (15 14:32 +0100)
treec5febe9296cd1fff80e706d2bcd2948c6fb292ef
parent53d1aa1b97bf7268c4e35643211c2867ae580120
parent35ec82bb164532086bf536beb5be505a1d566a95
Merge branch 'maint'