Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 25 Nov 2011 18:24:28 +0000 (19:24 +0100)
committerMarcel Werk <burntime@woltlab.com>
Fri, 25 Nov 2011 18:24:50 +0000 (19:24 +0100)
commit94f17e75f5d971c7d776c68005c7b55f8359da5c
treed9b6aba32dea5a361aa1a2ba3565b9faf2e678e6
parent0c07c50ca369dab91570d54725dbfe302fd6aae1
parent0896a550b389cda5e6b0ff7e76c60b319c6d1ac7
Merge branch 'master' of github.com:WoltLab/WCF

Conflicts:
com.woltlab.wcf/template/footer.tpl
com.woltlab.wcf/template/benchmark.tpl
wcfsetup/install/files/acp/style/style.css
wcfsetup/install/files/acp/templates/benchmark.tpl