Merge remote-tracking branch 'origin/radius-new-client-pkcs12'
authorSam Hartman <hartmans@debian.org>
Tue, 11 Sep 2012 18:15:49 +0000 (14:15 -0400)
committerSam Hartman <hartmans@debian.org>
Tue, 11 Sep 2012 18:15:49 +0000 (14:15 -0400)
1  2 
mech_eap/accept_sec_context.c
mech_eap/gssapiP_eap.h

Simple merge
Simple merge