From: Magnus Kühn <magnus.khn@gmail.com>
Date: Sat, 20 Apr 2013 08:34:31 +0000 (+0200)
Subject: Merge branch 'master' of github.com:WoltLab/WCF into js/abortRequest
X-Git-Tag: 2.0.0_Beta_1~32^2^2~2^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7733d6bc9fda0975776c585f3bccfc1f510457d3;p=GitHub%2FWoltLab%2FWCF.git

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

7733d6bc9fda0975776c585f3bccfc1f510457d3