Merge remote-tracking branch 'origin/libradsec' into moonshot
authorSam Hartman <hartmans@painless-security.com>
Mon, 30 Sep 2013 12:09:13 +0000 (08:09 -0400)
committerSam Hartman <hartmans@painless-security.com>
Mon, 30 Sep 2013 12:09:13 +0000 (08:09 -0400)
commit1820a5820c2feee0152e013ae2fab523ac7b5071
tree08d5c6cb616c09500bdfee4b6216b794b8844404
parentdf83d99a766a7a6649158aa9281ede960dab0510
parenta6ea0fa54ab96f56333d5e660a4a7fd7c061dd3c
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
lib/radius/Makefile.am