From: Nicolas Lœuillet Date: Fri, 3 Jan 2014 14:18:32 +0000 (+0100) Subject: Merge branch 'dev' of https://github.com/inthepoche/poche into dev X-Git-Tag: 1.3.1^2~5 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=2abcccb37180c17318f5226f5d4bc28f30b621ea;p=github%2Fwallabag%2Fwallabag.git Merge branch 'dev' of https://github.com/inthepoche/poche into dev --- 2abcccb37180c17318f5226f5d4bc28f30b621ea