Merge remote branch 'origin/libradsec-new-client' into HEAD
authorSam Hartman <hartmans@painless-security.com>
Tue, 11 Sep 2012 20:14:01 +0000 (20:14 +0000)
committerSam Hartman <hartmans@painless-security.com>
Tue, 11 Sep 2012 20:21:28 +0000 (20:21 +0000)
commitc836794133aae5df9e17d13084ce077afa8804b0
tree4e673342c50e9d090f32797d5729f0c5a53081a5
parenta033790fcc14f1c66fc2bd113d863e91a063f118
parentefb18a601811888127be69499cf10891aa3a4c37
Merge remote branch 'origin/libradsec-new-client' into HEAD

Conflicts:
lib/Makefile.am
lib/configure.ac
lib/Makefile.am
lib/configure.ac
lib/tcp.c