Merge branch 'master' into tlv-mic
authorLuke Howard <lukeh@padl.com>
Thu, 21 Apr 2011 18:22:45 +0000 (20:22 +0200)
committerLuke Howard <lukeh@padl.com>
Thu, 21 Apr 2011 18:22:45 +0000 (20:22 +0200)
commitbc115ffb6fea5399341faa59ad92a7e1cc722e8f
treeff3ee12409121da359cb17300fcc193a2a95e096
parentaecb56c6daec43ff20d2e5b170c53c3b3e7b9d10
parente82fcf22c3b6961beae883fc66bf4567896b7c4b
Merge branch 'master' into tlv-mic

Conflicts:
mech_eap/accept_sec_context.c
mech_eap/accept_sec_context.c
mech_eap/gssapiP_eap.h
mech_eap/init_sec_context.c
mech_eap/util_context.c