Merge branch 'master' into tlv-mic
authorLuke Howard <lukeh@padl.com>
Mon, 28 Mar 2011 22:37:38 +0000 (09:37 +1100)
committerLuke Howard <lukeh@padl.com>
Mon, 28 Mar 2011 22:37:38 +0000 (09:37 +1100)
commit88c01259b3609c9b94e22a339bb055e01aab185d
treefe5e078b0d5cab65a1fbedbb91a50226f685cd73
parentf493aa6956896a4810a63fb60e45a546a4e63282
parenta04b15c7a4dd621b7877ca26a434b0a4bfdec5e7
Merge branch 'master' into tlv-mic

Conflicts:
mech_eap/export_sec_context.c
mech_eap/import_sec_context.c
mech_eap/export_sec_context.c
mech_eap/gssapiP_eap.h
mech_eap/util.h
mech_eap/util_attr.cpp