Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Sat, 29 Mar 2014 19:37:17 +0000 (20:37 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sat, 29 Mar 2014 19:37:17 +0000 (20:37 +0100)

Trivial merge