Merge branch 'maint'
commitc247993f671256085ff8ba41e04801ca29ff00cd
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 22 Jun 2016 22:56:57 +0000 (23 00:56 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 22 Jun 2016 22:56:57 +0000 (23 00:56 +0200)
tree0360a7e53765176573e1d04651b7b39647a49b84
parenta24f339f58a5a97a813514b8768faf9131c83dd0
parent2f2e6625ac510b6035fcf8e505b9c76e1468b47b
Merge branch 'maint'