From: Daniel Martí Date: Sun, 2 Feb 2014 18:45:17 +0000 (+0100) Subject: Merge branch 'master' into logging X-Git-Tag: 0.2~336 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9a4fe8c7cdf83e3fcb1d84e8d265d0a8562e2355;p=fdroidserver.git Merge branch 'master' into logging --- 9a4fe8c7cdf83e3fcb1d84e8d265d0a8562e2355