Merge branch 'easy_pop3'
authorArt Cancro <ajc@citadel.org>
Sat, 11 Mar 2017 21:03:00 +0000 (16:03 -0500)
committerArt Cancro <ajc@citadel.org>
Sat, 11 Mar 2017 21:03:00 +0000 (16:03 -0500)

Trivial merge