From: Daniel Martí <mvdan@mvdan.cc>
Date: Sun, 31 Jan 2016 13:25:03 +0000 (+0000)
Subject: Merge branch 'patch-1' into 'master'
X-Git-Tag: 0.6.0~21
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0c68d1356070daf85e4fbfe944427272a191267d;p=fdroidserver.git

Merge branch 'patch-1' into 'master'

Support 'gpgkey' option as announced in sample config.



See merge request !93
---

0c68d1356070daf85e4fbfe944427272a191267d