From: Alexander Ebert Date: Tue, 19 May 2015 20:42:48 +0000 (+0200) Subject: Merge branch 'master' into next X-Git-Tag: 3.0.0_Beta_1~2380 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=955c340701e09865838a278a89adf004c67af20d;p=GitHub%2FWoltLab%2FWCF.git Merge branch 'master' into next Conflicts: com.woltlab.wcf/package.xml --- 955c340701e09865838a278a89adf004c67af20d