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)
commitbe376a6f0607e9fa490d6c456eebf033405186ae
tree33302ad5fad3a2b281300c7d4f71793b090670b8
parentec438df7ecf06142969954182bf277927562d7e4
parent73e9cb5f8c687d38082a60878d467f34eef0ede8
Merge branch 'ssl-protocol'

* 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>