tree fd734e854a2bdf477bc5efb6922f9ab24bf49344
parent 6a37cc3338f3eb36f73435b5bbe7a40bb056b9c5
parent f8cac0a2f2a31141653cbca822069c0e62685e16
author David Pursehouse <david.pursehouse@sonymobile.com> 1432178177 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> 1432255286 +0000

Merge branch 'stable-2.10' into stable-2.11

* stable-2.10:
  Avoid NPE when getting groups for anonymous users
  Identify the OAuth provider as simply "GitHub"
  Implementation of Gerrit OAuthServiceProvider


A merge was done with change I45d085503 but that was not a merge commit
so git does not know about it and conflicts will occur when trying to
merge.

This merge is done with the 'ours' strategy which keeps everthing from
the stable-2.11 branch.  In other words the content of the branch is the
same as before. The only difference is that now git is aware of the merge
and will not attempt to merge those commits again next time.

Change-Id: I4c96ea6cdeacb8abc7b6e31e36fe09e098c29014