Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Fri, 21 Mar 2014 13:36:55 +0000 (14:36 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 21 Mar 2014 13:36:55 +0000 (14:36 +0100)

Trivial merge