From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 10 Aug 2011 15:14:28 +0000 (-0700)
Subject: Merge pull request #98 from Gravatronics/mixedUpdates
X-Git-Tag: 2.0.0_Beta_1~1885^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=412f3c8da81d9b5f8703f038ad6137738921d245;p=GitHub%2FWoltLab%2FWCF.git

Merge pull request #98 from Gravatronics/mixedUpdates

Updated documentation + 2 extras
---

412f3c8da81d9b5f8703f038ad6137738921d245