Merge branch 'maint'
commit52338e87376e95603d1bbad776d07335af24ce95
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 19 Sep 2015 14:36:54 +0000 (19 16:36 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 19 Sep 2015 14:36:54 +0000 (19 16:36 +0200)
tree0132d5398ea4296ebd0624e8b9e9b58c7d342ab3
parentcc72db1fe6d29130bbe5713de00086c49fcdc98c
parent54a65250a81a2e230e2760857aa2303836e62ba5
Merge branch 'maint'