Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Fri, 16 May 2014 22:46:05 +0000 (00:46 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 16 May 2014 22:46:05 +0000 (00:46 +0200)

Trivial merge