Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Wed, 26 Nov 2014 18:21:49 +0000 (19:21 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 26 Nov 2014 18:21:49 +0000 (19:21 +0100)

Trivial merge