Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Sat, 10 May 2014 10:36:11 +0000 (12:36 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 10 May 2014 10:36:11 +0000 (12:36 +0200)

Trivial merge