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
Merge remote-tracking branch 'upstream/master'
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
[os_xml] make local functions static
[os_xml] remove unused function checkmemory()
[os_xml] make usage of keyword const
[os_xml] fixing compiler warnings
[os_xml] replac shared.h with standard headers
[os_xml] remove dead code and unused macros