From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 4 Feb 2015 21:18:28 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:wallabag/wallabag into dev
X-Git-Tag: 1.9beta~19
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=3fb0d44a67e9a88ad5669a4bf554069ad19877b0;p=github%2Fwallabag%2Fwallabag.git

Merge branch 'dev' of github.com:wallabag/wallabag into dev
---

3fb0d44a67e9a88ad5669a4bf554069ad19877b0