Merge branch 'master' of git://git.exim.org/exim
authorPhil Pennock <pdp@exim.org>
Sat, 22 Jan 2011 23:40:43 +0000 (18:40 -0500)
committerPhil Pennock <pdp@exim.org>
Sat, 22 Jan 2011 23:40:43 +0000 (18:40 -0500)
commitfa309239620364ef0f161ba6fa2ed67f372ab510
tree5dd9810bdfec3c4fa7512a1ff9a1271738010bd8
parent6f0c431a792c79870266913600a71f3be21ee620
parent0b4f0dad5075fa5a76dde9b677982fa565731b51
Merge branch 'master' of git://git.exim.org/exim