Merge branch 'master_condition_description'
authorTodd Lyons <tlyons@exim.org>
Sat, 6 Sep 2014 05:17:37 +0000 (22:17 -0700)
committerTodd Lyons <tlyons@exim.org>
Sat, 6 Sep 2014 05:17:37 +0000 (22:17 -0700)

Trivial merge