Merge branch 'refs/heads/next-php-di' into next-lantia
authorAlexander Ebert <ebert@woltlab.com>
Tue, 17 Nov 2015 12:59:21 +0000 (13:59 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 17 Nov 2015 12:59:21 +0000 (13:59 +0100)

Trivial merge