Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Tue, 13 May 2014 21:45:48 +0000 (23:45 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 13 May 2014 21:45:48 +0000 (23:45 +0200)

Trivial merge