Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Tue, 22 Jul 2014 13:39:10 +0000 (15:39 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 22 Jul 2014 13:39:10 +0000 (15:39 +0200)

Trivial merge