Merge remote-tracking branch 'origin/next' into next
authorMarcel Werk <burntime@woltlab.com>
Tue, 21 Jun 2016 12:15:20 +0000 (14:15 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 21 Jun 2016 12:15:20 +0000 (14:15 +0200)
commit9e5be318176429e2001b98a18d75347570135745
tree1ec32f385cef79e156791781f44691e0b29abec9
parentdca8d159be5e651d185fae912369550a240433ab
parentdcb74ba6da62adafc08770cc4a9b3a99ef7c9b69
Merge remote-tracking branch 'origin/next' into next

# Conflicts:
# wcfsetup/install/files/lib/page/AbstractArticlePage.class.php
wcfsetup/install/files/lib/page/AbstractArticlePage.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml