Merge branch 'maint'
commitba6d489321d53201531d4ce77e6e1d9e25c1cf56
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 6 Aug 2015 12:58:29 +0000 (6 14:58 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 6 Aug 2015 12:58:29 +0000 (6 14:58 +0200)
tree2a741dd20ac0203d8dfb33b223d20915cc2984cd
parentb5f5d66d8fe74bb3e99453560e8751122feceac0
parent4f3b3ce3d9329884e6cb8c7f2a7bc5344b01e36f
Merge branch 'maint'