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)
commitd5dba95ff07559b17eb762b3fd12c146beecb29f
treeb7fa210fbc5c37f5ac0f2daeb046516adcc0bd34
parentaf24687e957adad1738af9588bf03f40b370a694
parent8628dfe4dc1271a9775a1ae75c1269298a0a6fba
Merge branch 'master' into debian
Merge in 0.9.1
mech_eap/init_sec_context.c