Merge branch 'master' into tlv-mic
authorLuke Howard <lukeh@padl.com>
Mon, 4 Apr 2011 15:43:07 +0000 (01:43 +1000)
committerLuke Howard <lukeh@padl.com>
Mon, 4 Apr 2011 15:43:07 +0000 (01:43 +1000)
commit9931b82d3ff51899733f52109228f0ba74cd9546
tree8b4262bf80435337a8c03f9d823a173ddd1df4d2
parentd6f13175f7966d5c76c05cabbe3e1c264dd592ca
parentc500581dbe848b8e3e241ef3175e297279a359af
Merge branch 'master' into tlv-mic

Conflicts:
mech_eap/util_saml.cpp
accept_sec_context.c