phpbb/phpbb3 — pull request #680 by unknownbliss (2012-04-01 10:55:39+00:00)
Title: Adding template events & acp template events functionality and add some events.

Includes:
* #551
* unknownbliss/feature/events
* phpbb/develop
* #678
* cyberalien/ticket/10665
* Fixes all the conflicts

Replaces #678 and #551