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)
commit8c87d4468b226a63c5ba6b11036294be4f4795ab
treee0cbb75b677696230a73d344790df0f34dfb5742
parent0d8a1362b04bdca828d28095e4a788999dfb9a14
parenta3ced744a99d931e54aa1538899608894dc1cd92
Merge branch 'master' into tlv-mic

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