Merge branch '2.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Sun, 27 Apr 2014 16:29:56 +0000 (18:29 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Sun, 27 Apr 2014 16:29:56 +0000 (18:29 +0200)

Trivial merge