Fix notes
fix NEWS formatting
Merge branch 'bugfixes/tokumx-1.2'

Conflicts:
	distsrc/NEWS