Merge branch 'master' into todd_prdr
authorJeremy Harris <jgh146exb@wizmail.org>
Sun, 23 Dec 2012 15:06:53 +0000 (15:06 +0000)
committerJeremy Harris <jgh146exb@wizmail.org>
Sun, 23 Dec 2012 15:06:53 +0000 (15:06 +0000)
commitfd98bd161bbfa95f80fa6f39dd0e4511a72f06b5
tree712e01dc603d1b263b364ac5ca45dfddcf74105c
parent8634630392f78607a02cac9b5a96ed0b4724d2a0
parent8d68e115fc6f226cd2cdcea02adb358df5afb361
Merge branch 'master' into todd_prdr

Conflicts:
src/src/globals.c
src/src/acl.c
src/src/config.h.defaults
src/src/exim.c
src/src/globals.c
src/src/globals.h
src/src/macros.h
src/src/readconf.c
src/src/receive.c
src/src/smtp_in.c