Merge branch '2.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 9 Jun 2014 13:41:18 +0000 (15:41 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 9 Jun 2014 13:45:30 +0000 (15:45 +0200)

Trivial merge