Merge remote-tracking branch 'origin/libradsec' into HEAD
authorSam Hartman <hartmans@painless-security.com>
Tue, 3 Jan 2012 17:25:32 +0000 (12:25 -0500)
committerSam Hartman <hartmans@painless-security.com>
Tue, 3 Jan 2012 17:25:32 +0000 (12:25 -0500)
commita033790fcc14f1c66fc2bd113d863e91a063f118
treec25cfa09e95c593ddd3747431d5b9e7f383e49e7
parentfe9a8e272e429c6f9cf8760c056d162891a8d802
parentceecc52da787a7a2e495d913cbaa7dbe1d7830fb
Merge remote-tracking branch 'origin/libradsec' into HEAD

Conflicts:
lib/configure.ac