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)
commitb1ebfedbf928574389f2b8baa901c1665f40db74
treea5a7cbf93f7cec7c2666b68cac3260e21b95d195
parent3c5f613343538b67d9df258fcfb273d31af3ca39
parent5d2cc0917c19bdb6196f060cac3af9f175b295c8
Merge remote branch 'origin/master' into HEAD

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