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)
commit7aa45be08078868de382260f95b1b45f09610e11
tree315a60c7b6ec8be210113e12a5cab2c5ac85a068
parent65651b5dcdf866648a6d06b195d9a241d6aecd86
parentfdc24aea6397e4c8b91a8da322b81936989dedb5
Merge branch 'master' into debian

* Pull in change for  GSSEAP_TRACE
* pull in segfault fix
mech_eap/init_sec_context.c