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)
commit7db57acddeddad5f96d16288b3776baf6c10c0b1
tree397c0069584f02f260762ea624a3a14cabd10764
parentbb9927f5ce8a09c29d449cfacc6f5309c42c06e0
parentc21aba70c31e6b716107624d5a169012e0df5602
Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/moonshot
Reauth fixes

Conflicts:
shibboleth/opensaml2
shibboleth/sp
release_oid.c
util.h
util_context.c
util_krb.c
util_mech.c
util_reauth.c