Merge remote-tracking branch 'refs/remotes/origin/session' into next
authorAlexander Ebert <ebert@woltlab.com>
Wed, 6 Apr 2016 10:18:40 +0000 (12:18 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 6 Apr 2016 10:18:40 +0000 (12:18 +0200)
commit9ed6686c24479a21450c2d8b5c981cb9a1899a7a
treed8251a8be85c3e532f61f668cd73fc606b9cf3ca
parent96c16429b486697e0167c995259d9bec5f38615b
parente7ee059f5c04817df39462ae289528e7dfeddcb8
Merge remote-tracking branch 'refs/remotes/origin/session' into next

# Conflicts:
# wcfsetup/install/files/lib/data/session/Session.class.php

# wcfsetup/install/files/lib/data/session/virtual/SessionVirtual.class.php
wcfsetup/install/files/lib/data/acp/session/ACPSession.class.php
wcfsetup/install/files/lib/data/session/Session.class.php
wcfsetup/setup/db/install.sql