Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Sun, 12 Jul 2015 17:40:54 +0000 (19:40 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 12 Jul 2015 17:40:54 +0000 (19:40 +0200)
commit93b38a27ef188ecf094428ca3d960890c7f201e3
tree077c1509d43d121f68ade8f00a69cd37fb7916af
parentc25f6584582998151e9cb1f97ead3e52f79d9f08
parentaa0ca187904c7a0b2b3783be9899f25ec7f81c14
Merge branch 'next' of github.com:WoltLab/WCF into next

Conflicts:
wcfsetup/install/files/acp/templates/header.tpl