Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Sat, 17 May 2014 13:11:34 +0000 (15:11 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 17 May 2014 13:11:34 +0000 (15:11 +0200)

Trivial merge