Merge branch 'master' into sniffer
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 20 Dec 2012 15:11:29 +0000 (16:11 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 20 Dec 2012 15:11:29 +0000 (16:11 +0100)
commit51bfc747057761382724d13673e35f98e1666925
treeeeeb15ba143fadefb8dfe89bbfc67a21b8042686
parenta3765d0cc1186b1c68d593a3958a439bf4fd7e7d
parent023e3a96d27d42666e329b2eabdc39228ecfeeae
Merge branch 'master' into sniffer

Conflicts:
wcfsetup/install/files/lib/system/template/plugin/StaticlangTemplatePluginCompiler.class.php