Merge branch 'oldradius'
authorLuke Howard <lukeh@padl.com>
Tue, 21 Sep 2010 10:49:23 +0000 (12:49 +0200)
committerLuke Howard <lukeh@padl.com>
Tue, 21 Sep 2010 10:49:23 +0000 (12:49 +0200)
commit93ce21b38776e8a789904e9d770657d6dc4546e7
treed29b0531322b6b180414ffb7f6c306f0c1969807
parentca08e6a328204e8adc5bda929286d4386fe7b8b3
parent9f041e5982884023fd9e7f4eb7b4f45514b88758
Merge branch 'oldradius'

Conflicts:
mech_eap/accept_sec_context.c
mech_eap/init_sec_context.c
mech_eap/util_radius.cpp