Vincent Breitmoser 377d0f09fa Merge branch 'ditch-appmsg'
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
2014-07-29 13:53:18 +02:00
..
2014-06-09 21:55:32 +02:00
2014-06-28 20:44:01 +02:00
2014-06-23 21:46:17 +02:00
2014-07-27 18:21:39 +02:00
2014-06-28 20:24:02 +02:00
2014-06-09 21:55:32 +02:00