Merge branch 'improve-pubkey-export'
authorintrigeri <intrigeri@boum.org>
Mon, 2 Jul 2012 16:17:18 +0000 (18:17 +0200)
committerintrigeri <intrigeri@boum.org>
Mon, 2 Jul 2012 16:17:18 +0000 (18:17 +0200)

Trivial merge