Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Fri, 20 Jun 2014 19:43:57 +0000 (21:43 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 20 Jun 2014 19:43:57 +0000 (21:43 +0200)

Trivial merge