Daniel Albert d63534d655 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java

2014-07-16 18:49:16 +02:00

..

java/org/sufficientlysecure/keychain

test: use random string as passphrase

2014-07-13 16:38:27 +02:00

resources

Merge remote-tracking branch 'upstream/master'

2014-07-16 18:49:16 +02:00