tree 1a3388feee1aca47c004a3bc94fd9adb26b132d4
parent a15ce5d9f7857a37c0b5a40a24885714b4ad00e2
parent af5d1dc36ed40828dad1ec5d9b1ed3126c0df165
author Shawn Pearce <sop@google.com> 1368565844 -0700
committer Shawn Pearce <sop@google.com> 1368566751 -0700

Merge branch 'stable-2.5' into stable-2.6

* stable-2.5:
  Bump openid4java dependency to 0.9.8

Change-Id: Ia946c4a5a81106d6158016ac336ba7c9b7247911