Merge remote-tracking branch 'refs/remotes/origin/master' into next
authorAlexander Ebert <ebert@woltlab.com>
Wed, 12 Oct 2016 10:00:51 +0000 (12:00 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 12 Oct 2016 10:00:51 +0000 (12:00 +0200)
commit5ce48994e31a6c3fcb9d1690b4db46fb2669bd4b
treeb025e80ad1b6420adf71c5b0077eab8c270a789f
parent15d6735bd1cd29b7ec581d09e4b1421229138d0f
parent404d9826bafd9393dfb725676f5b4629e3e9cf63
Merge remote-tracking branch 'refs/remotes/origin/master' into next

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