From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 31 May 2014 14:44:13 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~772
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=938f5218a1037c1650f15f97e2894170cf6810d3;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

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

938f5218a1037c1650f15f97e2894170cf6810d3