k-9/src
cketti 601e2880ac Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/com/fsck/k9/mail/transport/SmtpTransport.java
2014-09-12 07:11:32 +02:00
..
com/fsck/k9 Merge remote-tracking branch 'upstream/master' 2014-09-12 07:11:32 +02:00