Merge branch 'maint'
commit87b0b0dca6549a1ede938d923660c45d804c83d2
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 1 Jan 2017 09:45:21 +0000 (1 10:45 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 1 Jan 2017 09:45:21 +0000 (1 10:45 +0100)
tree393c2be100147267cff3cf33dea58a12f52e215b
parent20f6c1965cd69cbb055c75117b971847cddb77c8
parentc7cc30b4d6ac562e7ee539f68f1754238b97dc61
Merge branch 'maint'