From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 24 May 2014 10:49:58 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~798^2^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=05828dbf233f403695e40c6953e512f4b4ca3b55;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

Conflicts:
	wcfsetup/install/files/js/WCF.Message.js
	wcfsetup/install/files/js/WCF.Message.min.js
---

05828dbf233f403695e40c6953e512f4b4ca3b55