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
..
2014-04-09 16:36:28 +02:00
2014-12-29 23:10:50 +01:00