Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Fri, 4 Apr 2014 11:20:45 +0000 (13:20 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 4 Apr 2014 11:20:45 +0000 (13:20 +0200)

Trivial merge