Merge branch 'master' into tlv-mic
authorLuke Howard <lukeh@padl.com>
Fri, 22 Apr 2011 10:58:57 +0000 (12:58 +0200)
committerLuke Howard <lukeh@padl.com>
Fri, 22 Apr 2011 10:58:57 +0000 (12:58 +0200)
commit4c1ce555f314832913d633f716eb9baca7fd309e
tree7f8ad5503c473bd87546e58a983f841269362379
parentb78d84eed61dcd97870fa135bbd9632cecbb83b0
parentb79cb354e8440f9d56aabd7957de7d25e5b9cf85
Merge branch 'master' into tlv-mic
accept_sec_context.c
gssapiP_eap.h
init_sec_context.c