Merge branch 'session'
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 2 Dec 2014 02:07:21 +0000 (03:07 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 2 Dec 2014 02:07:21 +0000 (03:07 +0100)

Trivial merge