Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Sat, 26 Apr 2014 12:07:03 +0000 (14:07 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 26 Apr 2014 12:07:03 +0000 (14:07 +0200)

Trivial merge