Dominik Schürmann 4c78d12fc6 Merge remote-tracking branch 'vincent/pgp_mime_preparations' into pgp_mime_preparations_view ... Conflicts: k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.java		2015-01-28 09:31:11 +01:00
..
src	Merge remote-tracking branch 'vincent/pgp_mime_preparations' into pgp_mime_preparations_view	2015-01-28 09:31:11 +01:00
build.gradle	Merge branch 'master' into pgp_mime_preparations	2015-01-20 18:35:07 +01:00