From: Nicolas Lœuillet <nicolas.loeuillet@gmail.com>
Date: Tue, 22 Oct 2013 06:51:30 +0000 (+0200)
Subject: Merge branch 'dev' of https://github.com/inthepoche/poche into dev
X-Git-Tag: 1.1.0~1
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=b6d859fa927be8e60752ea44d682401b10671dfa;p=github%2Fwallabag%2Fwallabag.git

Merge branch 'dev' of https://github.com/inthepoche/poche into dev
---

b6d859fa927be8e60752ea44d682401b10671dfa