Merge branch 'pop-tls'

diff --cc Makefile.am
Simple merge

diff --cc sbr/oauth.c
index 3433fba0545b714d4d21ada77cfb1f942ffe0dac,85fe7146e768f59920beedfd6ef3ceadba78ea38..f4564d0f0d982b7ee1769be3be22d736b09fb935
mode 100755,100644..100755
--- 1/sbr/oauth.c
--- 2/sbr/oauth.c
+++ b/sbr/oauth.c

diff --cc uip/inc.c
Simple merge

diff --cc uip/mhparse.c
Simple merge

diff --cc uip/msgchk.c
Simple merge

diff --cc uip/post.c
Simple merge

diff --cc uip/whatnowsbr.c
index 80386e95331883d053fc224c77934c3dbc53d2f8,8498f92cc4ab763407168351e7b72f7cbdbc7d55..d6c336f673bf9c107e503571f2ecff450d0b820d
--- 1/uip/whatnowsbr.c
--- 2/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@@ -942,12 -942,11 +942,11 @@@ buildfile (char **argp, char *file
      X("client host", -6, CLIESW) \
      X("server host", 6, SERVSW) \
      X("snoop", -5, SNOOPSW) \
 -    X("draftfolder +folder", -6, SDRFSW) \
 -    X("draftmessage msg", -6, SDRMSW) \
 -    X("nodraftfolder", -3, SNDRFSW) \
 +    X("draftfolder +folder", 0, SDRFSW) \
 +    X("draftmessage msg", 0, SDRMSW) \
 +    X("nodraftfolder", 0, SNDRFSW) \
      X("sasl", SASLminc(4), SASLSW) \
      X("nosasl", SASLminc(6), NOSASLSW) \
-     X("saslmaxssf", SASLminc(10), SASLMXSSFSW) \
      X("saslmech", SASLminc(5), SASLMECHSW) \
      X("authservice", SASLminc(0), AUTHSERVICESW) \
      X("user username", SASLminc(4), USERSW) \