Merge branch 'master' of git://github.com/k9mail/k-9
Merge branch 'master' of github.com:bcbarnes-gmx/k-9