Merge branch 'maint'
commit4b7b201c77c27a9403e5be42602bcdef742db06b
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 2 Jan 2016 16:40:41 +0000 (2 17:40 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 2 Jan 2016 16:40:41 +0000 (2 17:40 +0100)
treeb5cc2e6347f1c54d469cf7927804dd7bb972fb4e
parent5e63baf92ee767451a5fc8d0d5f3a200a4645cb9
parenta03175d6d971764de33c521a95bca1c6f35943e2
Merge branch 'maint'