Merge branch 'master' into todd_prdr
authorJeremy Harris <jgh146exb@wizmail.org>
Sun, 23 Dec 2012 20:28:19 +0000 (20:28 +0000)
committerJeremy Harris <jgh146exb@wizmail.org>
Sun, 23 Dec 2012 20:28:19 +0000 (20:28 +0000)
commitb063af044fbb6780cdcee56f9229c7b2c01b3033
tree03ff79a5fc9251f845e90436f26eddad79655639
parent225e8796145322dcebd4ea9df31f2315a5859853
parent8a06eed269a9756cc11cdbdb318f7272b9fa56c4
Merge branch 'master' into todd_prdr

Conflicts:
src/src/exim.c
src/src/exim.c