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


Trivial merge
Core Moonshot code including mech_eap