Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Sun, 27 Jul 2014 15:02:32 +0000 (17:02 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 27 Jul 2014 15:02:32 +0000 (17:02 +0200)

Trivial merge