Merge branch 'maint'
commita2fd3bc91b7c54f020611181bdd980d63ca40649
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 16 Mar 2017 12:08:12 +0000 (16 13:08 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 16 Mar 2017 12:08:12 +0000 (16 13:08 +0100)
tree57be25009a25a435685ac4edaaa939ccecce92ed
parentf2e5920f4107e47b297b0c34c64369ccd9cc026f
parent175543e5efe3787df3fed8683e6d749dcc0f16c4
Merge branch 'maint'