Merge branch '2.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Sun, 18 May 2014 16:25:53 +0000 (18:25 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Sun, 18 May 2014 16:25:53 +0000 (18:25 +0200)

Trivial merge