From: Nicolas Lœuillet Date: Thu, 10 Oct 2013 12:07:13 +0000 (+0200) Subject: Merge branch 'dev' of https://github.com/inthepoche/poche into dev X-Git-Tag: 1.1.0~5 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=0c994bd9349fd4c7f01dbbfef2be064e00c7f74e;p=github%2Fwallabag%2Fwallabag.git Merge branch 'dev' of https://github.com/inthepoche/poche into dev --- 0c994bd9349fd4c7f01dbbfef2be064e00c7f74e