open-keychain/OpenKeychain/src
Vincent Breitmoser e54dd26d29 Merge remote-tracking branch 'artbristol/functional-testing-canonicalize'
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
2014-07-07 18:19:52 +02:00
..
main Merge remote-tracking branch 'artbristol/functional-testing-canonicalize' 2014-07-07 18:19:52 +02:00
test actually canonicalize 2014-07-06 15:50:07 +01:00