Merge branch 'nico/import-gnupg'
authorNicolas Thill <nico@openwrt.org>
Thu, 21 Aug 2014 14:59:44 +0000 (16:59 +0200)
committerNicolas Thill <nico@openwrt.org>
Thu, 21 Aug 2014 14:59:44 +0000 (16:59 +0200)

Trivial merge