projects / shibboleth / xmltooling.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 59dbcae 353b772)
Merge remote-tracking branch 'origin/moonshot' into HEAD
authorSam Hartman <hartmans@painless-security.com>
Tue, 9 Aug 2011 18:32:18 +0000 (14:32 -0400)
committerSam Hartman <hartmans@painless-security.com>
Tue, 9 Aug 2011 18:32:18 +0000 (14:32 -0400)
Conflicts:
.cproject


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