Merge branch '2.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 21 Aug 2014 21:20:31 +0000 (23:20 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 21 Aug 2014 21:20:31 +0000 (23:20 +0200)

Trivial merge