Merge branch 'revocation-status' of https://github.com/honnel/openpgp-keychain into revocation-status

Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
This commit is contained in:
Daniel Hammann 2014-03-18 16:40:22 +01:00
commit 0550b22b49

Diff Content Not Available