Dominik Schürmann 91494dd3a3 Merge branch 'development' into v/crypto-input-parcel ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java

2015-03-30 15:53:44 +02:00

..

spongycastle/openpgp/operator/jcajce

generalize nfc crypto input structure

2015-03-18 18:25:44 +01:00

sufficientlysecure/keychain

Merge branch 'development' into v/crypto-input-parcel

2015-03-30 15:53:44 +02:00