From: Tim Düsterhus Date: Sat, 26 Jan 2013 13:42:06 +0000 (+0100) Subject: Merge branch 'master' of github.com:WoltLab/WCF X-Git-Tag: 2.0.0_Beta_1~537^2~5 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7ddcfa5c7e1f9889f9f2ca1cddc456437093c77c;p=GitHub%2FWoltLab%2FWCF.git Merge branch 'master' of github.com:WoltLab/WCF Conflicts: wcfsetup/install/files/acp/templates/package.tpl --- 7ddcfa5c7e1f9889f9f2ca1cddc456437093c77c