tree 3cda6ac79843007ce45c64b3e4235eea4e36035f
parent 1cdebf467c724d5f3009e44f669e156a5dedda11
parent bad310ec3f05644db07d6abbafb5291663ef0508
author David Pursehouse <david.pursehouse@sonymobile.com> 1430962668 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> 1430962668 +0900

Merge branch 'stable-2.10' into stable-2.11

* stable-2.10:
  OAuth: Simplify protocol implementation
  Allow to link user identity to another OAuth provider
  Update JGit to the 4.0.0.201505050340-m2 version
  Hybrid OpenID/OAuth: Support switching identities
  Hybrid OpenID/OAuth: Allow to link identity accross protocols
  OAuth: Check for session validity during logout

Change-Id: I9da0073a72d8c4327313405b11c66cd253ff640b