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)
commitb47c10882ea3409098780eb9608d3008c91f076d
tree88b95107023d8e8e849be8dcced0d1e826bf22e1
parent5668197e1b90f26ebb0fcc6acb30c70bf8109212
parent849faf84b633a519a29c54f182a4ac643425b760
Merge branch 'oldradius'

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