Merge branch 'master' of https://github.com/No3x/wp-mail-logging

Conflicts:
	WPML_Plugin.php
Merge branch 'master' of https://github.com/No3x/wp-mail-logging