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

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

c00cdfdd3bc8e53750d34c60d13cd2d885c5d4fd