open-keychain/OpenKeychain-Test
Vincent Breitmoser f9ef1160ca Merge branch 'development' into linked-identities
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
2015-03-24 15:29:58 +01:00
..