tree c8e9b39341d4c545ab24f87a8595b30e36eac857
parent f1ac0da7c3f0e32b20de53f888233a09d4a211ae
parent 8b5aa48f1da37ca35beddabcd85c306438be3fe3
author Saša Živkov <zivkov@gmail.com> 1429181578 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1429181579 +0000

Merge "Support hybrid OpenID and OAuth2 authentication" into stable-2.10