Files
open-keychain/OpenPGP-Keychain
Vincent Breitmoser 5e4239a7b9 Merge branch 'certify' into certs
Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
	OpenPGP-Keychain/src/main/res/values/strings.xml
2014-03-17 14:18:42 +01:00
..
2014-01-27 14:18:25 +01:00
2014-03-10 14:59:15 -04:00