Merge remote-tracking branch 'origin/next' into next
authorAlexander Ebert <ebert@woltlab.com>
Thu, 7 Apr 2016 16:58:05 +0000 (18:58 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 7 Apr 2016 16:58:05 +0000 (18:58 +0200)
commit81bd6a3b3518663340adaaf4b3bcdc5aa38354a3
treea19be66dc2f2c769e5b9bca3ead4dae66538c7b6
parentb5c94e9e7e99b16cdc5994c489b570035de86b83
parentd82507dcb5b36085f2fd4a9af7bde48b1b0f1472
Merge remote-tracking branch 'origin/next' into next

# Conflicts:
# wcfsetup/install/files/acp/templates/languageServerAdd.tpl
# wcfsetup/install/files/acp/templates/languageServerList.tpl