From: Nicolas Lœuillet <nicolas.loeuillet@gmail.com>
Date: Mon, 25 Nov 2013 08:49:08 +0000 (+0100)
Subject: Merge branch 'dev' of https://github.com/inthepoche/poche into dev
X-Git-Tag: 1.2.0~1
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=defa7754a4a532a985367394a28b359d099d7f34;p=github%2Fwallabag%2Fwallabag.git

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

defa7754a4a532a985367394a28b359d099d7f34