From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 14 Apr 2014 13:47:15 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~900
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0824027f486536ed7cdcdbcac48eca57c3694b83;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

Conflicts:
	com.woltlab.wcf/package.xml
	wcfsetup/install/files/js/WCF.Message.js
	wcfsetup/install/files/js/WCF.Message.min.js
---

0824027f486536ed7cdcdbcac48eca57c3694b83