Merge branch 'master' into tlv-mic
authorLuke Howard <lukeh@padl.com>
Tue, 29 Mar 2011 05:22:54 +0000 (16:22 +1100)
committerLuke Howard <lukeh@padl.com>
Tue, 29 Mar 2011 05:22:54 +0000 (16:22 +1100)
commit0f3f3b7509b309b1d71f24df5528d8a61a2a1214
treee67d9585381fc7604e5f262f3fd3a89866dfaf1c
parent5bf12d2604322220542f6ce610405708997fd65d
parent84cd14e1de18df28d36fe1d9489057c041cd7825
Merge branch 'master' into tlv-mic

Conflicts:
shibboleth/sp
mech_eap/util_attr.cpp