From: camporez Date: Sat, 15 Mar 2014 18:03:26 +0000 (-0300) Subject: Merge remote-tracking branches 'upstream/dev' and 'origin/master' into dev X-Git-Tag: 1.6.0^2~28^2~2 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=8754bd88a5c999fc009f02774a993efbf2a99e54;p=github%2Fwallabag%2Fwallabag.git Merge remote-tracking branches 'upstream/dev' and 'origin/master' into dev --- 8754bd88a5c999fc009f02774a993efbf2a99e54