open-keychain/OpenKeychain/src
Vincent Breitmoser 84eece622b support addition of user attributes
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
	OpenKeychain/src/main/res/values/strings.xml
2015-01-13 20:41:01 +01:00
..
main support addition of user attributes 2015-01-13 20:41:01 +01:00