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)

Trivial merge