Vincent Breitmoser 54bc874ce5 Merge remote-tracking branch 'origin/master' into external-test ... Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java		2014-07-11 21:00:26 +02:00
..
keychain	Merge remote-tracking branch 'origin/master' into external-test	2014-07-11 21:00:26 +02:00