Vincent Breitmoser 8132b9ac74 Merge branch 'master' into ditch-appmsg
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
2014-07-26 23:06:32 +02:00
..
2014-07-16 09:49:37 +02:00
2014-07-02 18:59:23 +02:00
2014-07-08 03:37:32 +02:00
2014-07-03 15:06:05 +02:00
2014-07-02 18:59:23 +02:00
2014-07-16 09:49:37 +02:00
2014-06-30 22:01:17 +02:00
2014-07-02 15:42:38 +02:00
2014-06-30 22:01:17 +02:00
2014-04-11 16:00:37 +02:00