projects / mech_eap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28e5c0e 51e614a)
Merge branch 'master' into tlv
authorLuke Howard <lukeh@padl.com>
Tue, 15 Mar 2011 01:19:11 +0000 (12:19 +1100)
committerLuke Howard <lukeh@padl.com>
Tue, 15 Mar 2011 01:19:11 +0000 (12:19 +1100)
Conflicts:
mech_eap/README
mech_eap/accept_sec_context.c


Trivial merge
Moonshot GSS-API mechanism