From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Sat, 20 Apr 2013 18:54:22 +0000 (+0200)
Subject: Merge branch 'wcfTemplateJS'
X-Git-Tag: 2.0.0_Beta_1~314
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=858f5497d76b24f7dd32660dcbe7b636a0ed5307;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'wcfTemplateJS'
---

858f5497d76b24f7dd32660dcbe7b636a0ed5307