Merge branch 'maint'
commiteabc864544671f77e9f27e6b9a0f1f2b79e3fa24
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 9 Aug 2015 22:20:43 +0000 (10 00:20 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 9 Aug 2015 22:20:43 +0000 (10 00:20 +0200)
tree9e23aefec125a0ec85ee30ba79a06a96929ed7f9
parentb55d0d01624a891bd45c0ef5fed1d5662bd81d85
parent3b20eed34ab39a91bb3922574c750724427966c8
Merge branch 'maint'