Dominik Schürmann 6da17ef6bb Merge branch 'master' into yubikey ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java

2014-08-14 13:31:01 +02:00

..

src/main

Merge branch 'master' into yubikey

2014-08-14 13:31:01 +02:00

.gitignore

Fix gitignore for lint

2014-04-09 16:36:28 +02:00

build.gradle

Merge branch 'master' into yubikey

2014-08-06 01:08:12 +02:00