Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 11 May 2013 23:26:57 +0000 (01:26 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 11 May 2013 23:26:57 +0000 (01:26 +0200)
commit38928f2b8c71fb9f9d54a94372b2936c078d365b
treefe599c7d0dbded26c7ee79863bdb3b6905018619
parentcd972eef15882aa89d7d4199fa7244320ca1cd40
parent9a02550eebee03f5830de539ae9e4b64ae06b153
Merge branch 'master' of github.com:WoltLab/WCF

Conflicts:
com.woltlab.wcf/template/headInclude.tpl
com.woltlab.wcf/template/headInclude.tpl