odip plugin added to makefile
added odip intermediate plugin
Unirec: Added check for multiple initialization
odip plugin: modified ipfix-elements and internalcfg
Merge branch 'odip'
Merge branch 'master' of homeproj.cesnet.cz:/var/reps/git/ipfixcol
ipfixcol: added missing element to xml
Fixed a bug with endless cycle for some output formats
refs #1874
fbitdump: added -Z option for testing filter syntax
Merge branch 'master' of homeproj.cesnet.cz:/var/reps/git/ipfixcol
fbitdump: using plain numbers levels
fbitdump: updated man pages
ipfixcol: added hooks intermediate plugin
ipfixcol: added -S option (print statistics)
ipfixcol: updated man pages
Increased dependency on newer library
fbitdump: fixed plain numbers in footer
ipfixcol unirec: increased version number
ipfixcol: added ipfixsend tool
Merge branch 'master' of homeproj.cesnet.cz:/var/reps/git/ipfixcol