# moved nl_date to newsletter settings
# changed tl_contents 'type' default
# added newsletter CTE's to show up on help.php (helpwizard support)
Merge branch 'master' of https://github.com/davidenke/newsletter_content

Conflicts:
	dca/tl_content.php