From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 18 Aug 2014 22:34:59 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~433
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6afbd3e7dea7e6ee2af071d08fe5515d63814845;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

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

6afbd3e7dea7e6ee2af071d08fe5515d63814845