Merge remote branch 'origin/master' into HEAD
authorSam Hartman <hartmans@painless-security.com>
Wed, 27 Apr 2011 13:56:32 +0000 (09:56 -0400)
committerSam Hartman <hartmans@painless-security.com>
Wed, 27 Apr 2011 13:56:32 +0000 (09:56 -0400)
commit56e9307122194ac49636ce2718523ea5889c6288
tree25d115e99b69d67e1380fdae1155feb0b57ac130
parent9677dd5838f7e834a9d0997e198bd9823d633c00
parentdb09fc23e4dc013ecd797c51f2a8179cb0dfe670
Merge remote branch 'origin/master' into HEAD

Conflicts:
moonshot/mech_eap/userok.c
13 files changed:
moonshot/mech_eap/Makefile.am
moonshot/mech_eap/accept_sec_context.c
moonshot/mech_eap/export_sec_context.c
moonshot/mech_eap/gssapiP_eap.h
moonshot/mech_eap/import_sec_context.c
moonshot/mech_eap/init_sec_context.c
moonshot/mech_eap/inquire_name.c
moonshot/mech_eap/mech_eap.exports
moonshot/mech_eap/util.h
moonshot/mech_eap/util_attr.cpp
moonshot/mech_eap/util_context.c
moonshot/mech_eap/util_sm.c
moonshot/mech_eap/util_token.c