From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 30 May 2013 17:31:10 +0000 (+0200)
Subject: Merge branch 'master' of github.com:WoltLab/WCF
X-Git-Tag: 2.0.0_Beta_2~12
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=486c7b71255ab32ba540a706b34042384d64d75b;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' of github.com:WoltLab/WCF
---

486c7b71255ab32ba540a706b34042384d64d75b