Merge branch 'master' into debian
authorSam Hartman <hartmans@debian.org>
Thu, 31 Jul 2014 20:31:25 +0000 (16:31 -0400)
committerSam Hartman <hartmans@debian.org>
Thu, 31 Jul 2014 20:31:25 +0000 (16:31 -0400)
Merge in 0.9.1

1  2 
mech_eap/init_sec_context.c

Simple merge