Vincent Breitmoser e457d4c909 Merge remote-tracking branch 'origin/master' ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/res/values-de/strings.xml		2014-09-15 14:00:17 +02:00
..
strings.xml	Merge remote-tracking branch 'origin/master'	2014-09-15 14:00:17 +02:00