Merge remote-tracking branch 'origin/next' into next
authorMarcel Werk <burntime@woltlab.com>
Thu, 26 May 2016 10:20:40 +0000 (12:20 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 26 May 2016 10:20:40 +0000 (12:20 +0200)
commit666e950c1c555c17e7d4286a9829e456cedf6676
tree9e93879760dd8aa18c72541c97800ad3d9dda0c0
parent23e43ac58b526d4fae4e974cb5fabf40e7cf16f4
parentaf110f8db3b9f499422832e531983c3619f1c864
Merge remote-tracking branch 'origin/next' into next

# Conflicts:

# wcfsetup/install/files/lib/system/template/plugin/LangCompilerTemplatePlugin.class.php