From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Wed, 9 Jul 2014 20:00:42 +0000 (+0200)
Subject: Merge branch 'edit-history'
X-Git-Tag: 2.1.0_Alpha_1~590
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2de319c0f6a48fd846983af5fa558d345a3b2b11;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'edit-history'
---

2de319c0f6a48fd846983af5fa558d345a3b2b11