Dominik Schürmann e10cbc54c6 Merge branch 'master' into yubikey ...

Conflicts:
	.gitmodules
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java

2014-08-01 11:09:25 +02:00

1.4 KiB

Raw Blame History

View Raw