Merge branch 'master' of ssh://git.exim.org/home/git/exim
authorTodd Lyons <tlyons@exim.org>
Wed, 4 Sep 2013 20:13:57 +0000 (13:13 -0700)
committerTodd Lyons <tlyons@exim.org>
Wed, 4 Sep 2013 20:13:57 +0000 (13:13 -0700)
1  2 
doc/doc-docbook/spec.xfpt

Simple merge