From: Nicolas Frandeboeuf Date: Wed, 21 Aug 2013 22:57:11 +0000 (+0200) Subject: Merge branch 'dev' of https://github.com/nicofrand/poche into dev X-Git-Tag: 1.0-beta4~35^2 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=57c91e427d20d520bc506bef52189a86d72a9255;p=github%2Fwallabag%2Fwallabag.git Merge branch 'dev' of https://github.com/nicofrand/poche into dev --- 57c91e427d20d520bc506bef52189a86d72a9255