Vincent Breitmoser 531697ffe7 Merge remote-tracking branch 'origin/development' into linked-identities
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
	OpenKeychain/src/main/res/layout/view_key_fragment.xml
2015-03-10 04:56:51 +01:00
..
2015-02-27 22:26:11 +01:00
2015-03-04 20:03:20 +01:00
2015-03-04 18:34:42 +01:00
2015-03-04 18:34:42 +01:00
2015-03-04 18:34:42 +01:00
2015-03-04 18:34:42 +01:00
2015-03-04 18:34:42 +01:00
2015-03-04 18:34:42 +01:00
2015-03-04 18:34:42 +01:00
2015-03-04 18:34:42 +01:00
2015-03-04 18:34:42 +01:00
2015-03-04 18:34:42 +01:00
2015-03-04 18:34:42 +01:00
2015-03-04 18:34:42 +01:00
2015-03-04 18:34:42 +01:00
2015-03-04 18:34:42 +01:00
2015-03-04 18:34:42 +01:00
2015-03-04 18:34:42 +01:00
2015-03-04 18:34:42 +01:00
2015-03-04 18:34:42 +01:00
2015-03-04 18:34:42 +01:00
2015-03-04 18:34:42 +01:00
2015-03-04 18:34:42 +01:00
2015-03-04 18:34:42 +01:00
2015-03-05 01:58:36 +01:00
2015-02-28 00:38:53 +01:00
2015-02-28 00:38:53 +01:00
2015-02-28 00:38:53 +01:00
2015-02-28 00:38:53 +01:00
2015-02-28 00:38:53 +01:00
2015-02-28 00:38:53 +01:00
2015-02-28 00:38:53 +01:00
2015-02-28 00:38:53 +01:00
2015-02-28 00:38:53 +01:00