From: Nicolas Lœuillet <nicolas.loeuillet@gmail.com>
Date: Sun, 25 Aug 2013 18:10:34 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:inthepoche/poche into dev
X-Git-Tag: 1.0-beta4~1
X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=07a5909d73595278436bc9b5064c69ad8476a9c2

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

07a5909d73595278436bc9b5064c69ad8476a9c2