Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 20 Sep 2011 13:14:06 +0000 (15:14 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 20 Sep 2011 13:14:06 +0000 (15:14 +0200)
commit3cf34d17449de4f1b6728c4d5e519efb802ddc33
tree5d29b2d81af292690d9236dcbd692a80c0520446
parent1b4e9186d7f4502f742dd85ce13ab889b5a9ef3c
parent72e6ec201e38294f3016afffc96df0890acc0f98
Merge branch 'master' of github.com:WoltLab/WCF

Conflicts:
wcfsetup/install/files/acp/templates/userList.tpl
wcfsetup/install/files/js/WCF.js
wcfsetup/install/files/acp/templates/userList.tpl
wcfsetup/install/files/js/WCF.js