From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 5 Jan 2013 12:18:49 +0000 (+0100)
Subject: Merge branch 'master' of github.com:WoltLab/WCF into travis
X-Git-Tag: 2.0.0_Beta_1~593
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9ce0053b776aa50b9738a8737b5456431b4b6cca;p=GitHub%2FWoltLab%2FWCF.git

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

9ce0053b776aa50b9738a8737b5456431b4b6cca