Merge branch '2.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Sun, 3 May 2015 14:36:25 +0000 (16:36 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Sun, 3 May 2015 14:36:25 +0000 (16:36 +0200)

Trivial merge