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-07-30 00:50:53 +02:00
2015-01-06 14:52:07 +01:00
2015-01-07 14:10:12 +01:00
2015-01-07 14:10:12 +01:00
2015-01-07 14:10:12 +01:00
2015-01-07 14:10:12 +01:00
2015-01-07 14:10:12 +01:00
2015-01-07 14:10:12 +01:00
2015-01-06 14:52:07 +01:00
2014-10-26 02:16:39 +02:00
2015-01-07 00:01:57 +01:00
2014-11-02 17:54:10 +01:00
2014-11-02 17:54:10 +01:00
2014-11-02 17:54:10 +01:00
2014-11-02 17:54:10 +01:00
2014-11-02 17:54:10 +01:00
2014-11-02 17:54:10 +01:00
2014-11-02 17:54:10 +01:00
2014-11-02 17:54:10 +01:00
2014-11-02 17:54:10 +01:00
2014-11-02 17:54:10 +01:00
2014-11-02 17:54:10 +01:00
2014-11-02 17:54:10 +01:00
2014-11-02 17:54:10 +01:00
2014-11-02 17:54:10 +01:00
2014-11-02 17:54:10 +01:00
2014-11-02 17:54:10 +01:00
2014-11-02 17:54:10 +01:00
2014-11-02 17:54:10 +01:00
2014-11-02 17:54:10 +01:00
2014-11-02 17:54:10 +01:00
2014-10-26 23:23:30 +01:00
2014-10-26 23:23:30 +01:00
2014-10-26 23:23:30 +01:00
2014-05-07 03:55:06 +02:00
2014-10-13 19:34:41 +02:00