From: Nicolas Lœuillet <nicolas.loeuillet@gmail.com>
Date: Mon, 12 Aug 2013 12:14:04 +0000 (-0700)
Subject: Merge pull request #132 from inthepoche/dev
X-Git-Tag: 1.0-beta3~1
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=667009727a38890eb651815843c1bc02869a4119;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #132 from inthepoche/dev

merge with beta2
---

667009727a38890eb651815843c1bc02869a4119