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)
commit4e4782498e1710043189e3db65b8121a0771ef42
treef275c476c49212481150645ef35f9ec27748dc4e
parent66b698b8474c63c29c6e265086c28b588e3eacd7
parent793ca670f584246a400dfee24a9edef46334510d
Merge branch 'master' into debian
Merge in 0.9.2
mech_eap/init_sec_context.c