From: nicosomb <nicolas@loeuillet.org>
Date: Thu, 18 Apr 2013 06:13:24 +0000 (+0200)
Subject: Merge branch 'master' of github.com:inthepoche/poche
X-Git-Tag: 0.1~11
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=ebf7a07bff8be55160ff5e5999f095e82f97277f;p=github%2Fwallabag%2Fwallabag.git

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

ebf7a07bff8be55160ff5e5999f095e82f97277f