Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Wed, 2 Apr 2014 15:13:14 +0000 (17:13 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 2 Apr 2014 15:13:14 +0000 (17:13 +0200)

Trivial merge