Merge branch 'master' of github.com:dschuermann/openpgp-keychain

This commit is contained in:
Dominik Schürmann
2013-09-17 16:54:02 +02:00