git://git.exim.org / users / jgh / exim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2016f1 60f8e1e)
Merge branch 'master' into transp_logging_1031 transp_logging_1031
authorJeremy Harris <jgh146exb@wizmail.org>
Sat, 27 Jul 2013 13:57:48 +0000 (14:57 +0100)
committerJeremy Harris <jgh146exb@wizmail.org>
Sat, 27 Jul 2013 13:57:48 +0000 (14:57 +0100)
Conflicts:
src/src/expand.c

1  2 
src/src/expand.c patch | diff1 | diff2 | blob | history

diff --cc src/src/expand.c
Simple merge
Jeremy Harris' staging directory