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
..
java/com/fsck/k9	Merge branch 'master' into pgp_mime_preparations	2015-01-20 18:35:07 +01:00
AndroidManifest.xml	Merge remote-tracking branch 'k9mail_pgp_mime/master'	2014-12-20 08:07:46 +01:00