From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 15 Jul 2014 15:49:24 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~567
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bebf3d0bb8b8d30157ef343c48637f7aee7862cd;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

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

bebf3d0bb8b8d30157ef343c48637f7aee7862cd