Merge branch 'master' into tlv-mic
authorLuke Howard <lukeh@padl.com>
Thu, 31 Mar 2011 09:07:15 +0000 (20:07 +1100)
committerLuke Howard <lukeh@padl.com>
Thu, 31 Mar 2011 09:07:15 +0000 (20:07 +1100)
commit8927466f450e7f4813ab52c66f664b993737949e
treea0c3519e1470ee5ecfda28a2c88f76e11cf8e43f
parentdf9316af118fe794a51d1e3520eaba00581ccc29
parenta631ffefe39bab66f7960f485535ad0d19a6e5da
Merge branch 'master' into tlv-mic
accept_sec_context.c
util.h