Merge branch 'ssl-protocol'
authorW. Trevor King <wking@tremily.us>
Mon, 30 Jun 2014 17:10:10 +0000 (10:10 -0700)
committerW. Trevor King <wking@tremily.us>
Mon, 30 Jun 2014 17:10:10 +0000 (10:10 -0700)
* ssl-protocol:
  CHANGELOG: Document this branch
  Added the option "smtp-ssl-protocol" to make STARTTLS work on Python 3.3+

Signed-off-by: W. Trevor King <wking@tremily.us>

Trivial merge