From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 13 Jan 2015 21:45:33 +0000 (+0100)
Subject: Merge pull request #999 from moparisthebest/additions_dev
X-Git-Tag: 1.9beta~36
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=af5c371e951ae2bc9ccd9a7164e0c04101b39ace;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #999 from moparisthebest/additions_dev

Miscellaneous additions
---

af5c371e951ae2bc9ccd9a7164e0c04101b39ace