projects / shibboleth / opensaml2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3a96cab 4da890f)
Merge remote-tracking branch 'origin/moonshot' into HEAD
authorSam Hartman <hartmans@painless-security.com>
Tue, 9 Aug 2011 20:37:32 +0000 (16:37 -0400)
committerSam Hartman <hartmans@painless-security.com>
Tue, 9 Aug 2011 20:37:32 +0000 (16:37 -0400)
Conflicts:
.cproject


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.