Merge remote-tracking branch 'refs/remotes/origin/master' into next
authorAlexander Ebert <ebert@woltlab.com>
Thu, 24 Dec 2015 11:02:09 +0000 (12:02 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 24 Dec 2015 11:02:09 +0000 (12:02 +0100)
commit91591fe83087ac0cc976fcdf47dc89d7ae87e8be
tree0abfd2d0b65420d4fcad9aeaaeec3ebbebb3ab7e
parente90198a71c8367ab0238a6c73cc9802c8d3b6f8f
parentbe60e5a3259b82d69e6cbd5dcf047e7d5b530b96
Merge remote-tracking branch 'refs/remotes/origin/master' into next

# Conflicts:
# com.woltlab.wcf/package.xml
# wcfsetup/install/files/lib/system/WCF.class.php