From: Jay Sitter <jsitter@gmail.com>
Date: Sat, 1 Nov 2014 22:29:41 +0000 (-0400)
Subject: Merge branch 'dev' into uitextcase
X-Git-Tag: 1.8.1^2~3^2~5
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=266b7328ef77d42a3ea69c0d839c1003e834df56;p=github%2Fwallabag%2Fwallabag.git

Merge branch 'dev' into uitextcase
---

266b7328ef77d42a3ea69c0d839c1003e834df56