From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 7 Sep 2014 13:21:46 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.0_Alpha_1~347
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f70647141ab187b66e60bd85f8c40e0993f21b1e;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'

Conflicts:
	wcfsetup/install/files/lib/data/user/avatar/DefaultAvatar.class.php
---

f70647141ab187b66e60bd85f8c40e0993f21b1e