Revert "corrected a merge mistake in CHANGELOG"

This reverts commit c9f89a92ba78364ef276f7901af17ba8ef5c9624.
Revert "Revert "corrected a merge mistake in CHANGELOG""

This reverts commit d57bf3667c70a673794e08001b220bf893f1755f.
Merge branch 'master' of https://github.com/getting-things-gnome/gtg
Merge branch 'master' of https://github.com/getting-things-gnome/gtg
Fixes #15: Sendmail plugin fails by Nimit Shah