Merge remote-tracking branch 'origin/ietf-approved' into debian
authorSam Hartman <hartmans@debian.org>
Tue, 18 Sep 2012 20:12:12 +0000 (16:12 -0400)
committerSam Hartman <hartmans@debian.org>
Tue, 18 Sep 2012 20:12:12 +0000 (16:12 -0400)
commit24e08f643cde22fe49c848e2836af9e86be2a0b8
treeef67db3dd9c797d38a9a5db1e020088d640f22b9
parentaddff2a741d44ec7a2b0c6f33621bf1958f51997
parentff1af0135c24b0a5bf24a2909466be3b617868ee
Merge remote-tracking branch 'origin/ietf-approved' into debian

Conflicts:
lib/Makefile.am
lib/build-aux/ltmain.sh
lib/Makefile.am
lib/radsec.c