From: Thomas Citharel <tcit@tcit.fr>
Date: Sun, 1 Feb 2015 10:27:10 +0000 (+0100)
Subject: Merge branch 'dev' into reloadarticle
X-Git-Tag: 1.9beta~22^2~2
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=b05f482dd219acd5f5c7e9669ad8bd168ba224c6;p=github%2Fwallabag%2Fwallabag.git

Merge branch 'dev' into reloadarticle
---

b05f482dd219acd5f5c7e9669ad8bd168ba224c6