Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Mon, 28 Apr 2014 13:50:37 +0000 (15:50 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 28 Apr 2014 13:50:37 +0000 (15:50 +0200)

Trivial merge