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
..
LocalMessageExtractorTest.java	Convert remaining tests to JUnit4	2015-01-14 04:05:42 +01:00
ReconstructMessageFromDatabaseTest.java	Add test for updating a message with a missing part	2015-01-10 04:39:02 +01:00