From: Sam Hartman <hartmans@painless-security.com>
Date: Mon, 30 Sep 2013 12:09:13 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/libradsec' into moonshot
X-Git-Tag: debian/0.0.5-1~20^2~2
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=radsecproxy.git;a=commitdiff_plain;h=1820a5820c2feee0152e013ae2fab523ac7b5071

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

Conflicts:
	lib/Makefile.am
	lib/configure.ac
	lib/libradsec.spec.in
	lib/radius/Makefile.am
	lib/radsec.c
	lib/radsecproxy/tlscommon.c
	lib/tcp.c
	lib/tls.c
---

1820a5820c2feee0152e013ae2fab523ac7b5071