Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 27 Mar 2016 15:20:09 +0000 (17:20 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 27 Mar 2016 15:20:09 +0000 (17:20 +0200)
commitee5d4a18fc849849a070348471b4db383a11ebbd
treecc3f1c40d66de3eee1b4be34cc0d0f5cf8b7f580
parent2061eb146b87781016404b089beb8f233265ead1
parent6a12da02bf08dca0852f5c6b73ea0aa9ab989255
Merge branch 'master' into next

# Conflicts:
# com.woltlab.wcf/templates/moderationComment.tpl
com.woltlab.wcf/templates/moderationComment.tpl