Merge branch 'master' of ssh://git.exim.org/home/git/exim
authorTodd Lyons <tlyons@exim.org>
Wed, 30 Apr 2014 00:07:04 +0000 (17:07 -0700)
committerTodd Lyons <tlyons@exim.org>
Wed, 30 Apr 2014 00:07:04 +0000 (17:07 -0700)
1  2 
doc/doc-docbook/spec.xfpt
doc/doc-txt/ChangeLog

Simple merge
Simple merge