Merge branch 'master' into debian
authorSam Hartman <hartmans@debian.org>
Wed, 22 Oct 2014 19:09:36 +0000 (15:09 -0400)
committerSam Hartman <hartmans@debian.org>
Wed, 22 Oct 2014 19:09:36 +0000 (15:09 -0400)
* Pull in change for  GSSEAP_TRACE
* pull in segfault fix

1  2 
mech_eap/init_sec_context.c

Simple merge