Merge branch 'fastreauth'
authorLuke Howard <lukeh@padl.com>
Thu, 23 Sep 2010 23:42:23 +0000 (01:42 +0200)
committerLuke Howard <lukeh@padl.com>
Thu, 23 Sep 2010 23:42:23 +0000 (01:42 +0200)
commit16253100e6ed561736f6be291ef584b785f57131
tree0c0b24e18865b14b8516aa7ab7ebcc351d3d43fe
parentf600d6bcf8ab95e6113dadcfc4db7b21ae5412fb
parentfe67093cdf6bb234d595759d0ffd472fff6f3c96
Merge branch 'fastreauth'

Conflicts:
mech_eap/util_cred.c
mech_eap/set_cred_option.c