Merge branch 'edit-history'
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 9 Jul 2014 20:00:42 +0000 (22:00 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 9 Jul 2014 20:00:42 +0000 (22:00 +0200)

Trivial merge