Merge branch '2.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Sun, 24 Aug 2014 15:43:43 +0000 (17:43 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Sun, 24 Aug 2014 15:43:43 +0000 (17:43 +0200)

Trivial merge