Merge remote-tracking branch 'refs/remotes/origin/master' into next
authorAlexander Ebert <ebert@woltlab.com>
Wed, 5 Oct 2016 15:17:23 +0000 (17:17 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 5 Oct 2016 15:17:23 +0000 (17:17 +0200)
commit103afeef3cf09b4fab1bbb9256bb1e141483cb44
treebe3970797cc07585504b210cafd6a37cf4db637a
parent67b39a0ced89759acac75abdec800cdc7c3b6b73
parent1a02d9d52d47d7649eb08486879dcc154881b2dc
Merge remote-tracking branch 'refs/remotes/origin/master' into next

# Conflicts:
# wcfsetup/install/lang/en.xml
wcfsetup/install/lang/en.xml