projects / shibboleth / resolver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4efcb74 538a7b8)
Merge remote-tracking branch 'origin/moonshot' into HEAD
authorSam Hartman <hartmans@painless-security.com>
Tue, 13 Dec 2011 20:24:58 +0000 (15:24 -0500)
committerSam Hartman <hartmans@painless-security.com>
Tue, 13 Dec 2011 20:24:58 +0000 (15:24 -0500)

Trivial merge
Resolver to bridge GSS to Shibboleth