Merge remote-tracking branch 'origin/master' into debian
authorKevin Wasserman <krwasserman@hotmail.com>
Thu, 4 Apr 2013 18:20:20 +0000 (14:20 -0400)
committerKevin Wasserman <krwasserman@hotmail.com>
Thu, 4 Apr 2013 18:20:20 +0000 (14:20 -0400)
1  2 
mech_eap/init_sec_context.c

Simple merge