Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/moonshot
authorLuke Howard <lukeh@padl.com>
Sun, 2 Jan 2011 08:57:19 +0000 (19:57 +1100)
committerLuke Howard <lukeh@padl.com>
Sun, 2 Jan 2011 08:58:28 +0000 (19:58 +1100)
commita4a91192e39832457581c00a484ae567b2f7e30f
tree8e5064e63c1dad2a0260ebfa0696c83656bc66b1
parent5a3bedda8ea1351a653c28b2f2780040cb906de0
parent3e08e1e56a2de06a4d0ea39325582dfe34806c44
Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/moonshot
Reauth fixes

Conflicts:
shibboleth/opensaml2
shibboleth/sp
cyrus-sasl
libradsec
mech_eap/release_oid.c
mech_eap/util.h
mech_eap/util_context.c
mech_eap/util_krb.c
mech_eap/util_mech.c
mech_eap/util_reauth.c