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)
commitff451b1ffbc4e6ad2b21b077b481a3b18d66b9e9
tree169c4057bb4901e5cc0916a8bf621a7aa7448b11
parent54e17878e1f2965f192acad6886ce49b126934dd
parenta29da8c76ed0d616bf31cad3134795f15ff4dcc1
Merge branch 'master' into tlv-mic

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