k-9/k9mail/src/androidTest/java/com/fsck
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
..
k9 Merge branch 'master' into pgp_mime_preparations 2015-01-20 18:35:07 +01:00