Merge branch 'maint'
commit2156abcc3009492349465b1a4e5631e9f09ad261
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 9 Aug 2015 00:13:20 +0000 (9 02:13 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 9 Aug 2015 00:13:20 +0000 (9 02:13 +0200)
tree546b93a9ee59e761679b2c610c1453a6257ad353
parentac29de7241805125748590cd55f2c183e27a5700
parent46f3f4c626d6dfe48c0101e3c994a929b542ba77
Merge branch 'maint'