Merge branch 'master' of ssh://git.exim.org/home/git/exim
authorTodd Lyons <tlyons@exim.org>
Mon, 7 Oct 2013 02:31:57 +0000 (19:31 -0700)
committerTodd Lyons <tlyons@exim.org>
Mon, 7 Oct 2013 02:31:57 +0000 (19:31 -0700)
1  2 
doc/doc-docbook/spec.xfpt

Simple merge