Merge branch 'master' into debian
authorSam Hartman <hartmans@debian.org>
Mon, 15 Sep 2014 21:49:13 +0000 (17:49 -0400)
committerSam Hartman <hartmans@debian.org>
Mon, 15 Sep 2014 21:49:13 +0000 (17:49 -0400)
Merge in 0.9.2

1  2 
mech_eap/init_sec_context.c

Simple merge