Execute the property workflow
Fixed typo error
Added better changelog for pull request 42 brought from the master branch
Trigger custom comment events on comment add/remove/reply
Use commented object as context instead of comment within event trigger

- In order this to work with plone.contentrules use commented object as
  the main context within custom discussion events and add comment as the
  second parameter.
Update change log
Add custom content rules string substitutions

- Add content rules string substitutions for comment:
  - id
  - text
  - author email
  - author user name
  - author full name
Remove hard dependency on plone.stringinterp
i18n update
Merge pull request #47 from eea/2.2.x

Trigger custom events on comment add/remove/reply (git chery-pick from master branch)
Revert "Merge pull request #47 from eea/2.2.x"

This reverts commit 248419e4b9b0623d7a713dd0ba5ebad2e91ba64b, reversing
changes made to 7870630240eb66117c2c64bdd3d3533b012a2678.
Trigger custom comment events on comment add/remove/reply

Conflicts:
	plone/app/discussion/interfaces.py

Conflicts:
	plone/app/discussion/interfaces.py
Use commented object as context instead of comment within event trigger

- In order this to work with plone.contentrules use commented object as
  the main context within custom discussion events and add comment as the
  second parameter.
Update change log

Conflicts:
	CHANGES.rst

Conflicts:
	CHANGES.rst
Add custom content rules string substitutions

- Add content rules string substitutions for comment:
  - id
  - text
  - author email
  - author user name
  - author full name
Remove hard dependency on plone.stringinterp
Add tests for custom events and contentrules events/string substitutions

Conflicts:
	setup.py
backport gaudenz' change: Replace $.live with $.on for jQuery >= 1.9 compatibility. This works on jQuery >= 1.7 (Plone 4.3 onwards).
Merge branch '2.2.x' of git://github.com/eea/plone.app.discussion into eea-2.2.x

Conflicts:
	CHANGES.rst
Merge branch 'eea-2.2.x' into 2.2.x