From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Wed, 31 Jul 2013 15:19:50 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 0.3^0
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=85ebc80c7eaf88e4d57a52adb8e4c32d8cc34b64;p=github%2Fwallabag%2Fwallabag.git

Merge branch 'dev'
---

85ebc80c7eaf88e4d57a52adb8e4c32d8cc34b64