Merge branch 'maint'
commitc3c285f9597ffd9fe8575eac25f8404a61d37d50
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 7 Sep 2015 19:21:46 +0000 (7 21:21 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 7 Sep 2015 19:21:46 +0000 (7 21:21 +0200)
treedc6c283c44efaba65c2ebe371877a38bf99588e8
parent40cc8623f10ff819459f0dcca3fb303628e7f2fb
parent9600ce5f96ce9018e9f5fe28acd901f45de1ead6
Merge branch 'maint'