projects
/
moonshot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
60b017d
9962adb
)
Merge branch 'master' into debian
author
Sam Hartman
<hartmans@debian.org>
Sun, 31 Oct 2010 21:38:26 +0000
(17:38 -0400)
committer
Sam Hartman
<hartmans@debian.org>
Sun, 31 Oct 2010 21:38:26 +0000
(17:38 -0400)
Conflicts:
shibboleth/opensaml2
shibboleth/xmltooling
Trivial merge