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)
commitc3ff83a02d37820b9c70cc3746c72a900dfd85ac
tree0f03be1c61c5befb2098b2e9c9809f3a94f285d8
parent47cb5eac0d36eda61ed5cb6fabfb4f13e5ed71d0
parent4c822665dcd5b2becc04c30e2a1655650fcb1c3c
Merge branch 'fastreauth'

Conflicts:
mech_eap/util_cred.c
set_cred_option.c