Adapted docs in ipfix.h to reflect changes in API
Callback registration by template, not template set any more
Merge branch 'feature/v9-ready' into develop
incremental progress, change to pthread condition variables
Merge branch 'develop' into feature/libftrace
incremental progress on libftrace