Ignore Atlassian config from IntelliJ
Merge branch 'master' of git://github.com/k9mail/k-9 into MessageCounts
Merge branch 'master' of git://github.com/k9mail/k-9
Merge branch 'master' into MessageCounts