Merge branch 'googlePlusAuth' into 2.0
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 5 May 2014 18:31:18 +0000 (20:31 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 5 May 2014 18:31:18 +0000 (20:31 +0200)
commit5c15b9f259a6cf6f3978f456282b1b2068af4d4b
treeff17a6b5ed2992e7bd2facaf1eacd061cf0ab800
parentee490f0c3045b48a4b9114814b18842fad714c4c
parent3222d87699d993d8b4e866c6ead49f96ba098dec
Merge branch 'googlePlusAuth' into 2.0