Merge tag 'libradsec-0.0.5' into debian
authorSam Hartman <hartmans@painless-security.com>
Wed, 12 Feb 2014 02:17:19 +0000 (21:17 -0500)
committerSam Hartman <hartmans@painless-security.com>
Wed, 12 Feb 2014 02:17:19 +0000 (21:17 -0500)
commitd78a0c6725823419bf54d4f9d45ddd402caaa7a0
tree4e8a86ad5d9a4658e1350ecb2aff19a5786452ed
parent7b065194a99aa15b10ff1e69547eb1b44d5399a8
parentf18e7f2ab31160c00a7b363542fc4cea57d0fa14
Merge tag 'libradsec-0.0.5' into debian

libradsec-0.0.5

Conflicts:
lib/conf.c
lib/radius/Makefile.am
lib/Makefile.am
lib/radius/Makefile.am