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)
commitf4952db2835a261d478321c930db5af27496e598
tree81d605780d88a7f70202567cdb6eeae7d0979fc7
parent0e66b3b655cefaf20e3ce7347b45e158c3427831
parentd69645bc124ce675326b0778d261962791855b38
Merge branch 'master_condition_description'