From: Thomas Citharel <tcit@tcit.fr>
Date: Mon, 22 Dec 2014 13:33:01 +0000 (+0100)
Subject: Merge branch 'dev' into randomarticle
X-Git-Tag: 1.9beta~23^2~3
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=f3917b1ee4bba812e82da57dd181f50d62926db4;p=github%2Fwallabag%2Fwallabag.git

Merge branch 'dev' into randomarticle
---

f3917b1ee4bba812e82da57dd181f50d62926db4