Merge branch 'master' of https://github.com/ossec/ossec-hids
Merge branch 'master' of https://github.com/ddpbsd/ossec-hids
Merge branch 'master' of https://github.com/ossec/ossec-hids
Merge branch 'master' of https://github.com/ossec/ossec-hids
fix for time_t.h on macosx.
Merge pull request #309 from jrossi/macosx-time_h-fix

fix for time.h time_t on macosx.
fix pr 282
Merge pull request #313 from cgzones/fix_pr282

fix 312
[os_maild] fix compiler warnings
[os_maild] fix potential nullpointer dereference
[os_maild] reduce variable scope
[os_maild] add nonnull qualifiers
Merge branch 'master' of https://github.com/ddpbsd/ossec-hids
No spaces around "=" in variable assignments.
Reported mysteriously on http://www.ossec.net/?p=1135#comment-555 by
"jg." This comment was brought to my attention by Doug Burks on the
user mailing list. I guess we need to start monitoring comments on
everything everywhere?
Merge pull request #315 from ddpbsd/fix-host-deny

Fix host deny
update postgresql.schema
[tests] test searchAndReplace()
[shared] fix searchAndReplace()
[tests] reenable all tests
Merge pull request #318 from cgzones/fix_searchAndReplace

fix searchAndReplace()