Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Fri, 11 Jul 2014 09:33:41 +0000 (11:33 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 11 Jul 2014 09:33:41 +0000 (11:33 +0200)

Trivial merge