Merge branch 'maint'
commitc1c510ffe05e646985cdfa033d15a7076b846dad
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 17 Jan 2017 10:36:40 +0000 (17 11:36 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 17 Jan 2017 10:36:40 +0000 (17 11:36 +0100)
treeceb36723bdade50da47de4315bbf5f17a3ca77b2
parent9e4578366160cfdc484d3f4a11ba10d4739ffaa3
parentb223c099f0bd1bc559c2ba1e47d1e032ab4ddb43
Merge branch 'maint'