Merge branch 'master' into debian
authorSam Hartman <hartmans@debian.org>
Fri, 27 Sep 2013 12:52:03 +0000 (08:52 -0400)
committerSam Hartman <hartmans@debian.org>
Fri, 27 Sep 2013 12:52:03 +0000 (08:52 -0400)
Conflicts:
libeap/Makefile.am

1  2 
mech_eap/init_sec_context.c

Simple merge