From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 18 Aug 2011 19:47:22 +0000 (+0200)
Subject: Merge branch 'master' of github.com:WoltLab/WCF
X-Git-Tag: 2.0.0_Beta_1~1849
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=24b7c25f794abd7d3e5cf680200276facf32ae66;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' of github.com:WoltLab/WCF

Conflicts:
	wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php
---

24b7c25f794abd7d3e5cf680200276facf32ae66