From: Daniel Martí Date: Sun, 28 Feb 2016 13:37:17 +0000 (+0000) Subject: Merge branch 'p1' into 'master' X-Git-Tag: 0.7.0~98 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=fdroidserver.git;a=commitdiff_plain;h=bf3247743344edf676a51c568cc35f6f0bdc95e5 Merge branch 'p1' into 'master' Fix pubkey extraction on update Replacement of !86. Fix pubkey extraction in case of non-empty _JAVA_OPTIONS. Fixes #133. I didn't actually run the test suite (it looks like there are some preparations to be done for that), but I checked the commands from `test_fdroid_popen_stderr_redirect` in ipython. See merge request !103 --- bf3247743344edf676a51c568cc35f6f0bdc95e5