v2.3.1 resolves client lib conflicts

git-svn-id: https://plugins.svn.wordpress.org/google-apps-login/trunk@891246 b8457f37-d9ea-0310-8a92-e5e31aec5664