Dominik Schürmann 881a50207a Merge branch 'master' into yubikey ... Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle		2014-08-06 01:08:12 +02:00
..
keychain	Merge branch 'master' into yubikey	2014-08-06 01:08:12 +02:00