Files
open-keychain/OpenKeychain/src/main/java/org/sufficientlysecure
mar-v-in cae0071342 Merge branch 'master' into automatic-contact-discovery
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
2014-06-04 21:32:37 +02:00
..