Merge branch 'master' into debian
authorSam Hartman <hartmans@painless-security.com>
Tue, 17 Jan 2012 22:54:15 +0000 (17:54 -0500)
committerSam Hartman <hartmans@painless-security.com>
Tue, 17 Jan 2012 22:54:15 +0000 (17:54 -0500)
commitff75eafeec837c9a81c1d7bcf936970c403d0825
tree0b4a64b35e1f9719163553b64ca04f04d0d0139b
parent3d96770c0858281264a38c30b78b3e78942ff075
parentc711946286567fac4abc1fcbf55f2a9bb4148db9
Merge branch 'master' into debian

Conflicts:
.gitignore
.gitignore
configure.ac