From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Mon, 5 May 2014 18:31:18 +0000 (+0200)
Subject: Merge branch 'googlePlusAuth' into 2.0
X-Git-Tag: 2.0.7~41
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5c15b9f259a6cf6f3978f456282b1b2068af4d4b;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'googlePlusAuth' into 2.0
---

5c15b9f259a6cf6f3978f456282b1b2068af4d4b