ok I think I have it this time.
it's lots of fun doing this on my phone.
Remove bro-ids.
Merge remote-tracking branch 'upstream/master' into no-bro
Merge remote-tracking branch 'origin/master'
Merge branch 'no-bro'
Add an openntpd rule
 importing lua-5.2.3
Building on Unix
adding ossec-lua to be installed
Merge remote-tracking branch 'upstream/master'
merging
adding some standard modules
ossec-lua building on windows
add unit tests for os_xml
simplyfy os_xml testing code
os_xml: more testcases
travis: install lcov for testing
os_xml: more testcases
[os_xml] update makefile
[os_xml] do not define XML_VAR by global compiler flag