Merge branch '2.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 3 Apr 2014 16:09:16 +0000 (18:09 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 3 Apr 2014 16:09:16 +0000 (18:09 +0200)

Trivial merge