cketti 9b61fe0f0e Merge remote-tracking branch 'k9mail_pgp_mime/master' ... Conflicts: src/com/fsck/k9/activity/AccessibleEmailContentActivity.java		2014-11-12 19:22:53 +01:00
..
KeyChainKeyManager.java	Validate client certificate dates	2014-08-29 10:47:39 -04:00
TrustManagerFactory.java	chain the exception	2014-10-11 16:11:12 +01:00
TrustedSocketFactory.java	Revert "Implement SSL file-based session caching"	2014-10-07 21:23:04 -04:00