Merge remote-tracking branch 'origin/master' into debian
authorSam Hartman <hartmans@debian.org>
Thu, 10 Oct 2013 14:22:04 +0000 (10:22 -0400)
committerSam Hartman <hartmans@debian.org>
Thu, 10 Oct 2013 14:22:04 +0000 (10:22 -0400)
Fix segfault LP: 1237981

1  2 
mech_eap/init_sec_context.c

Simple merge