Merge remote-tracking branch 'origin/libradsec' into HEAD

author Sam Hartman <hartmans@painless-security.com>

Mon, 5 Dec 2011 19:03:32 +0000 (14:03 -0500)

committer Sam Hartman <hartmans@painless-security.com>

Mon, 5 Dec 2011 19:03:32 +0000 (14:03 -0500)
author Sam Hartman <hartmans@painless-security.com>
Mon, 5 Dec 2011 19:03:32 +0000 (14:03 -0500)
committer Sam Hartman <hartmans@painless-security.com>
Mon, 5 Dec 2011 19:03:32 +0000 (14:03 -0500)
diff --cc lib/Makefile.am
Simple merge
diff --cc lib/radsec.c
Simple merge
diff --cc lib/rsp_tlscommon.c
Simple merge
author	Sam Hartman <hartmans@painless-security.com>
	Mon, 5 Dec 2011 19:03:32 +0000 (14:03 -0500)
committer	Sam Hartman <hartmans@painless-security.com>
	Mon, 5 Dec 2011 19:03:32 +0000 (14:03 -0500)
		1	2
lib/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
lib/radsec.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/rsp_tlscommon.c	patch \|	diff1 \|	diff2 \|	blob \| history