From: Nicolas Lœuillet <nicolas.loeuillet@gmail.com>
Date: Sat, 17 Aug 2013 19:26:11 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:inthepoche/poche into dev
X-Git-Tag: 1.0-beta4~39
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=8d52e6b4e33f76d0ea92a4de5074d204e1762d95;p=github%2Fwallabag%2Fwallabag.git

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

8d52e6b4e33f76d0ea92a4de5074d204e1762d95