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)
commitb2002998eebfaec7e080c64b7c583150478dfaa4
tree29c4cba2804257be922c9f8ed12279792176f79f
parentba369a8de1372f31cb5e22aa29fab3928d8fb5e5
parent30b1e4ad8fd2fcf82e8da92e81f0a93a03b37e13
Merge branch 'master' into debian

Conflicts:
libeap/Makefile.am
mech_eap/init_sec_context.c