Merge branch 'maint'
commit7b6bd0b85846c4a203f5abb26879dc358285dfa4
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 16 Aug 2015 17:31:01 +0000 (16 19:31 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 16 Aug 2015 17:31:01 +0000 (16 19:31 +0200)
tree3d5accf8a824f1ed372746fa131e6f6dca2c7673
parent86170ff501bd267318959e24936a496a59e48d80
parent17a225621c73b4990bd4458924a249aa0a11650e
Merge branch 'maint'