merged
Merge branch 'master' of github.com:collective/collective.newsticker

Conflicts:
	buildout.cfg