Merge branch 'maint'
commit1658cb26ff9af4034ba6b9534e5db8b906127a74
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 2 Dec 2016 22:25:26 +0000 (2 23:25 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 2 Dec 2016 22:25:26 +0000 (2 23:25 +0100)
treec9da14203f7aeb0f0dacc3412116497631fffa56
parentdfb76590c0619e58865acb06943d8169fe7de95c
parente72485336fdcaf568c4afc3ca76913f9ecb9495f
Merge branch 'maint'