Merge remote-tracking branch 'freeradius/v3.0.x' into tr-upgrade
authorKevin Wasserman <kevin.wasserman@painless-security.com>
Thu, 26 Jun 2014 17:06:19 +0000 (13:06 -0400)
committerKevin Wasserman <kevin.wasserman@painless-security.com>
Thu, 26 Jun 2014 17:06:19 +0000 (13:06 -0400)
commit14a87b81409ef1b07f589b05f013b4e2356b75a3
tree054eff00445e6e1326ddfe784f775c10054a7d30
parent4ca09576d948b5b74d83a3d981a3b121b87bae20
parent7bae7c8ed3ae6420c749f04ab3cb716e00071389
Merge remote-tracking branch 'freeradius/v3.0.x' into tr-upgrade

Conflicts:
src/include/realms.h
src/main/realms.c
src/main/tls.c
src/modules/rlm_eap/libeap/eap_chbind.c
src/modules/rlm_eap/libeap/eap_chbind.h
src/modules/rlm_eap/radeapclient.c
src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
share/dictionary.freeradius.internal
src/include/radius.h
src/include/tls-h
src/main/realms.c
src/main/tls.c
src/main/tls_listen.c
src/modules/rlm_eap/libeap/eap_types.h
src/modules/rlm_eap/libeap/eapcommon.c
src/modules/rlm_eap/radeapclient.c
src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
src/modules/rlm_realm/rlm_realm.c