Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Wed, 2 Apr 2014 13:47:41 +0000 (15:47 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 2 Apr 2014 13:47:41 +0000 (15:47 +0200)

Trivial merge