David King f02a8cf0e6 Merge pull request #1705 from EXreaction/ticket/11833 ...

Fix invalid template loop & prevent Twig from throwing errors in invalid uses of BEGINELSE

2013-09-12 21:17:22 -07:00

..

prosilver

Merge pull request #1705 from EXreaction/ticket/11833

2013-09-12 21:17:22 -07:00

subsilver2

Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop

2013-09-12 14:57:26 -05:00