From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 19 Aug 2014 18:33:49 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~423
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d325938d159c37d4314cf171ab4f3cb2f84536db;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

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

d325938d159c37d4314cf171ab4f3cb2f84536db