Merge commit 'v2.4' into HEAD
authorSam hartman <hartmans@painless-security.com>
Wed, 17 Apr 2013 11:26:04 +0000 (12:26 +0100)
committerSam hartman <hartmans@painless-security.com>
Wed, 17 Apr 2013 11:26:04 +0000 (12:26 +0100)
commit292ff8f6da2fb3ad3686029946a6d77fdb11aa6f
tree17f6bf1e4ad69245bf7b070777490b6e2ae3629a
parent3008df9a5b53c9fd0cbdaeb010a2e1b067231eae
parent3279aacdeed2aac96741c02e2ddecbb5ae087ff8
Merge commit 'v2.4' into HEAD

Conflicts:
Makefile.am
Makefile.am