Merge branch 'maint'
commit94f6b8e124979e943b9450e138e827bd39951a9e
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 11 Oct 2015 21:56:57 +0000 (11 23:56 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 11 Oct 2015 21:56:57 +0000 (11 23:56 +0200)
tree765f8072545774c22df27376289972a8c061465a
parenta898059dea72ca5be3e8688843c81e55547e12bc
parentc0c16b88fa300b8661b2d40615f2ae12ccd9673c
Merge branch 'maint'