Merge tag 'upstream/0.9.2' into debian
authorSam Hartman <hartmans@debian.org>
Tue, 16 Sep 2014 11:12:26 +0000 (07:12 -0400)
committerSam Hartman <hartmans@debian.org>
Tue, 16 Sep 2014 11:12:26 +0000 (07:12 -0400)
commitf97b4afa66e8dac81ebb2091cae16f03f69ddd36
tree9d3f44f7a08b4c06410c19e69edb9d919230b58e
parentcad75f2a4ad5229b5035ad5a633e4a10d9fb5b9f
parent38791e2c8e2c94ed906593931831bda6577d5346
Merge tag 'upstream/0.9.2' into debian

Conflicts:
.gitignore
Makefile.in
build-aux/config.guess
build-aux/config.sub
build-aux/depcomp
build-aux/install-sh
build-aux/ltmain.sh
build-aux/missing
configure
libeap/Makefile.in
m4/libtool.m4
mech_eap/.gitignore
mech_eap/Makefile.in