Merge tag 'upstream/0.9.5' into debian
authorSam Hartman <hartmans@debian.org>
Tue, 14 Jul 2015 20:11:32 +0000 (16:11 -0400)
committerSam Hartman <hartmans@debian.org>
Tue, 14 Jul 2015 20:11:32 +0000 (16:11 -0400)
1  2 
mech_eap/init_sec_context.c

Simple merge