Merge branch 'maint'
commit6340a78c9fabfda8bb4d1fba28a3ca0213b8f742
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 12 Nov 2016 00:23:36 +0000 (12 01:23 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 12 Nov 2016 00:23:36 +0000 (12 01:23 +0100)
tree54764886dc3d95ec3efebcfa50821c1d0f60e5b8
parentea3de7286e2bb8f43ce8fa2021ebbaaf88bffee5
parent393f49038624dd388fa1059c1cf1e210e8ca3fb6
Merge branch 'maint'