Merge branch 'maint'master
commitcc80e7a8cea5df0522b719818e7045e2aa06d65c
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 29 Apr 2017 14:27:30 +0000 (29 16:27 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 29 Apr 2017 14:27:30 +0000 (29 16:27 +0200)
tree746f1d30173bcd0b851554d362e82d7980a47fd0
parent6834142d8763d16b3d2722c698e55c6f4693625f
parente527e49c38c9d54aadf7bdeaba68e89012b963cb
Merge branch 'maint'