cketti 23c9398c03 Merge branch 'master' into pgp_mime_preparations ... Conflicts: k9mail/src/androidTest/java/com/fsck/k9/mailstore/LocalMessageTest.java		2015-01-20 18:35:07 +01:00
..
activity	use `@Test(expected =`	2015-01-14 04:31:36 +01:00
endtoend	Base class is already annotated	2015-01-14 03:34:57 +01:00
helper	Convert remaining tests to JUnit4	2015-01-14 04:05:42 +01:00
mail	Simplify ImapConnection#connect	2015-01-14 04:41:21 +01:00
mailstore	Merge branch 'master' into pgp_mime_preparations	2015-01-20 18:35:07 +01:00