Merge remote-tracking branch 'origin/next' into next
authorAlexander Ebert <ebert@woltlab.com>
Wed, 28 Sep 2016 20:38:33 +0000 (22:38 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 28 Sep 2016 20:38:33 +0000 (22:38 +0200)
commit0b4d3d3b0d3ffc7241d6b134ed134ba07cf01043
treeda4f982e5b3f55447856aa23cc42ad52dc0d4d54
parent234f0a1797ee1c83fa4d4e4df30cf0a6998befd0
parente22e99b18cb328df8eb1da15c88c03ef01ca2ef6
Merge remote-tracking branch 'origin/next' into next

# Conflicts:
# wcfsetup/install/files/lib/util/HeaderUtil.class.php