From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 1 Jun 2016 14:22:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'refs/remotes/origin/master' into next
X-Git-Tag: 3.0.0_Beta_1~7
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4e3526db16f1997604c9f2679cd77b4e15e8acf3;p=GitHub%2FWoltLab%2Fcom.woltlab.wcf.legalNotice.git

Merge remote-tracking branch 'refs/remotes/origin/master' into next

# Conflicts:
#	package.xml
---

4e3526db16f1997604c9f2679cd77b4e15e8acf3