Merge branch 'maint'
commit25b02e7cc84e1c820b046f372e5025595f880b48
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 15 Aug 2015 21:50:27 +0000 (15 23:50 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 15 Aug 2015 21:50:27 +0000 (15 23:50 +0200)
tree5f4825ed10687ecf269717a84772df8e1ff5e639
parent69b0db33a1e9e95f3f25dcb861e14dc16a1dec00
parent8d00cd896614a6e794765bdcfc7ee9bedd6dc075
Merge branch 'maint'