Merge branch 'maint'
commit8887e1de1c0795ae9e35d230a3b407da4b40e804
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 27 Nov 2016 11:20:30 +0000 (27 12:20 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 27 Nov 2016 11:20:30 +0000 (27 12:20 +0100)
tree98b6bb6db49d3f03e8347d5af85d1ed7a6f68baf
parent8165eb9156116e069a17d0e0c4b2466858e4bede
parent7fc980f75eff268a9879360f4d940bea659de489
Merge branch 'maint'