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
..
src/main	Merge branch 'master' into pgp_mime_preparations	2015-01-20 18:35:07 +01:00
build.gradle	Enable lint checks for k9mail-library	2015-01-05 23:26:36 +01:00