Merge branch '2.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Sun, 14 Dec 2014 16:19:29 +0000 (17:19 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Sun, 14 Dec 2014 16:19:29 +0000 (17:19 +0100)

Trivial merge