Merge branch 'master' of git://github.com/baudehlo/Haraka
Merge branch 'master' of git://github.com/baudehlo/Haraka
Fix travis failure from undefined var
Merge pull request #615 from smfreegard/master

Fix travis failure from undefined var