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)
commit5df6c2b56f9f92b78bd50541c3b8a03dead1f0d1
treeeb7b3be51d8f2bdda677c504b4370fbf4907b89f
parent5c81820044e8b20084c246dd16beb0188d9b97bd
parent909b7b08c38e4954c60d47ebee4f8159beb58b10
Merge branch 'master' into tlv-mic

Conflicts:
shibboleth/sp
util_attr.cpp