Merge branch 'maint'
commita2d0cd922e5b4367114feeefa8cef0d621914162
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 2 Sep 2015 19:32:12 +0000 (2 21:32 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 2 Sep 2015 19:32:12 +0000 (2 21:32 +0200)
tree67a52d6a28e3639b3801ab0daa4494c1f092ce5e
parenta6165748cf669974af05324f1e037a2fb5fd5bf6
parent980aef2dfbef4ead2ed61a2fcf441c02e88a820c
Merge branch 'maint'