From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 16 Aug 2014 18:09:17 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~438
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e9c160c8eaccb89a39f2a7fe85394ce43f1f1823;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

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

e9c160c8eaccb89a39f2a7fe85394ce43f1f1823