From: Paulino Michelazzo <paulino@michelazzo.com.br>
Date: Tue, 18 Oct 2016 20:48:23 +0000 (+0200)
Subject: Merge remote-tracking branch 'wallabag/master'
X-Git-Tag: 2.1.3~20^2~7
X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=99731f0bb1f6fd2815eeb9af504ce86df927657b

Merge remote-tracking branch 'wallabag/master'
---

99731f0bb1f6fd2815eeb9af504ce86df927657b