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