Merge branch 'template_hooks_for_moderation'
authortilly-Q <nattilypigeonfowl@gmail.com>
Tue, 13 May 2014 18:49:54 +0000 (14:49 -0400)
committertilly-Q <nattilypigeonfowl@gmail.com>
Tue, 13 May 2014 18:49:54 +0000 (14:49 -0400)

Trivial merge