From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 1 Mar 2015 17:52:34 +0000 (+0100)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.1~31^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ce2f9a520ab3f4032d1a9386d60d9d046ec5b7eb;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

Conflicts:
	README.md
---

ce2f9a520ab3f4032d1a9386d60d9d046ec5b7eb