Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Tue, 22 Apr 2014 22:09:33 +0000 (00:09 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 22 Apr 2014 22:09:33 +0000 (00:09 +0200)

Trivial merge