TODO: added plugin renames
Merge branch 'master' of github.com:msimerson/Haraka

Conflicts:
	TODO