Merge branch 'master' of github.com:WoltLab/WCF
authorTim Düsterhus <duesterhus@woltlab.com>
Sat, 26 Jan 2013 13:42:06 +0000 (14:42 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Sat, 26 Jan 2013 13:42:06 +0000 (14:42 +0100)
commit7ddcfa5c7e1f9889f9f2ca1cddc456437093c77c
tree3e82bd35368bce2391a3c6cb0215a4c50d005f51
parentbb1c4b7dabf8df26afb8dbf811787cf3ab31539e
parente7c727adbe175ebe217a7ee82a3c1c7f745c7d7e
Merge branch 'master' of github.com:WoltLab/WCF

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