From: Nicolas Lœuillet Date: Tue, 7 Jan 2014 12:13:30 +0000 (+0100) Subject: Merge branch 'dev' of https://github.com/inthepoche/poche into dev X-Git-Tag: 1.3.1^2~1 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=f41d00ed8a1d25bee6376d7f8a309642636dd4a1;p=github%2Fwallabag%2Fwallabag.git Merge branch 'dev' of https://github.com/inthepoche/poche into dev --- f41d00ed8a1d25bee6376d7f8a309642636dd4a1