Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Wed, 11 Feb 2015 12:58:48 +0000 (13:58 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 11 Feb 2015 12:58:48 +0000 (13:58 +0100)

Trivial merge