Merge branch 'legacy_63'

Conflicts:
	.gitignore
	checkalias.c
	configure.ac
	contrib/README
	fetchmail.c
	fetchmail.man
	socket.c

diff --cc .gitignore
index a3b2417822280daa25843f3fbc324770e18e456e,4dab50bd401769c6a12c783e1b762d15ee13173b..4040a9fc677fe7e4d4e38b78cf3cc75733c34243
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -26,14 -29,12 +29,14 @@@ dox
  FAQ
  FEATURES
  fetchmail
- fetchmailconf
+ fetchmail-*.tar.*
++fetchmail-*.tar.xz
  fetchmail-FAQ.pdf
  fetchmail-man.html
  fetchmail.spec
- fetchmail-*.tar.*
- fetchmail-*.tar.xz
+ fetchmailconf
  genlsm.sh
 +IMAPCapa
  install-sh
  libfm.a
  m4/
@@@ -45,12 -46,9 +48,10 @@@ mkinstalldir
  mxget
  netrc
  NOTES
- *.o
  po/Makefile
  po/POTFILES
 +po/remove-potcdate.sed
  po/stamp-po
- .project
  py-compile
  rcfile_l.c
  rcfile_y.c

diff --cc Makefile.am
Simple merge

diff --cc NEWS
Simple merge

diff --cc TODO.txt
Simple merge

diff --cc configure.ac
index e0d4a8fcc8c80a8b42775b4e8368f3ed9c5972c6,ebb4db56b7e4275c357256a0be95e375d2bff710..83e75ef4182f8df38520324685dd525dfb77e9a8
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -9,7 -9,7 +9,7 @@@ dnl Process this file with autoconf to 
  dnl
  
  dnl XXX - if bumping version here, check fetchmail.man, too!
- AC_INIT([fetchmail],[7.0.0-alpha4],[fetchmail-devel@lists.berlios.de])
 -AC_INIT([fetchmail],[6.3.25],[fetchmail-users@lists.berlios.de])
++AC_INIT([fetchmail],[7.0.0-alpha5],[fetchmail-devel@lists.berlios.de])
  AC_CONFIG_SRCDIR([fetchmail.h])
  AC_CONFIG_HEADERS([config.h])
  AC_CONFIG_LIBOBJ_DIR([.])

diff --cc contrib/README
index 096e24b8b4b32ec76caed9518702155f687a178b,5eaa51e95b8f7ad38ad2b416e49dc10d3bff1211..607e1642e25cb63c69bddb0919ade9c557c5feca
--- 1/contrib/README
--- 2/contrib/README
+++ b/contrib/README
@@@ -96,8 -197,13 +96,13 @@@ A logrotate configuration file developp
  when he wanted to use /var/log/fetchmail instead of the usual syslog.
  It probably needs to be adjusted for use on other systems.
  
 -### delete-later (added 2007-03-17, --ma)
 +### rawlog.patch (added 2011-06-17, --ma)
  
 -A MySQL/Tcl/Expect-based client-side script to remove messages at a
 -certain age.  See delete-later.README for details.
 -(By Carsten Ralle, Yoo GmbH, Germany.)
 +A patch against fetchmail 6.3.20 to allow creating a raw socket log if
 +configured through an environment variable, to assist debugging and
 +troubleshooting.  Documentation at the beginning of the file.
+ 
+ ### gai (added 2013-02-03, --ma)
+ 
+ A trivial getaddrinfo() program to check the getaddrinfo() call from the
+ system, as a research tool for the fetchmail developers.

diff --cc fetchmail.c
Simple merge

diff --cc fetchmail.man
index d387b812f22db0bab60d7eee1c35583b276472f2,f5355b1213514e30fd0d37d3873daccc310dd139..fb19fbbabf6516e3bdbea9c67b72081dec03450d
--- 1/fetchmail.man
--- 2/fetchmail.man
+++ b/fetchmail.man
@@@ -10,7 -10,7 +10,7 @@@
  .\" Load www macros to process .URL requests, this requires groff:
  .mso www.tmac
  .\"
- .TH fetchmail 1 "fetchmail 7.0.0-alpha4" "fetchmail" "fetchmail reference manual"
 -.TH fetchmail 1 "fetchmail 6.3.25" "fetchmail" "fetchmail reference manual"
++.TH fetchmail 1 "fetchmail 7.0.0-alpha5" "fetchmail" "fetchmail reference manual"
  
  .SH NAME
  fetchmail \- fetch mail from a POP, IMAP, ETRN, or ODMR-capable server

diff --cc socket.c
Simple merge