open-keychain/OpenKeychain/src
Vincent Breitmoser 9ef2795fcd Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
2015-03-21 15:57:35 +01:00
..
main Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel 2015-03-21 15:57:35 +01:00