Vincent Breitmoser 8132b9ac74 Merge branch 'master' into ditch-appmsg ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java

2014-07-26 23:06:32 +02:00

1.2 KiB

Raw Blame History

View Raw