Files
open-keychain/OpenKeychain
Vincent Breitmoser b779211f55 Merge branch 'master' into v/multi-decrypt
this also fixes weird-bug

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
	OpenKeychain/src/main/res/values/strings.xml
2015-06-06 23:40:22 +02:00
..
2014-04-09 16:36:28 +02:00
2015-05-10 10:44:04 +02:00