projects / shibboleth / sp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d3e0fd 8e9c50d)
Merge commit '8e9c50db98f6c0bbf58ec714786b8207de75d55d' into debian
authorSam Hartman <hartmans@debian.org>
Mon, 25 Apr 2011 17:24:47 +0000 (13:24 -0400)
committerSam Hartman <hartmans@debian.org>
Mon, 25 Apr 2011 17:24:47 +0000 (13:24 -0400)
Conflicts:
.cproject
.project


Trivial merge
Shibboleth SP