Merge branch 'maint'
commitba104f34830f9bf4d5c275ef3aaf8e5d9ff650d4
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 10 Sep 2015 09:13:47 +0000 (10 11:13 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 10 Sep 2015 09:13:47 +0000 (10 11:13 +0200)
tree1cfb61bc3ba2f441ddfc0fe707ea7dbc3fc35855
parent66a2119ae6a217a160ee02c5a6773372ad997399
parent62dc515ae520422fc35409232884ac6d9e3b3d74
Merge branch 'maint'