fix reindexObject for comment container object
Fix comments Title if utf-8 characters in author_name
user member.getId as author_username, so membrane users and plone users have portraits and author urls
fix typo in changelog
Merge pull request #42 from eea/master

Comments do not retain Mark for Deletion state
Amend commit history of changes made by omiron from pull request 42 for a clearer message of intended fix
fix test. the richtext-field in plone.app.contenttypes uses a behavior
Prepare 2.3.0 release.
Make sure a release includes *.rst files.
Back to development: 2.3.1
2.3.0 was a brown bag release.
Preparing release 2.3.1
merge upstream and fix numbering
Merge pull request #41 from maartenkling/master

uses member.getId as author_username, so membrane users have portrait and author url
Fix buildout that broke due to version conflicts caused by the latest p.a.contenttypes release.
Merge branch 'master' of git://github.com/huubbouma/plone.app.discussion into huubbouma-master

Conflicts:
	CHANGES.rst
Merge branch 'fix_reindex_on_publish' of git://github.com/RedTurtle/plone.app.discussion into RedTurtle-fix_reindex_on_publish
Move 'Fix reindexObject ...' CHANGES entry to the current release.
ignore local directory from virtualenv
added update translations script (flavor by saily)