Fixed build of json plugin
json storage: fixed error message
json storage: fixed formatting
ipfixcol: updated changelog
ipfixcol: better intermediate plugin's API
libsiso: added UDP data size limit
ipfixcol: fixed mapping template ids from one ODID
odip intermediate: using global template manager
ipfixcol: fixed possible segfault
ipfixcol: fixed compiler warnings
postgres storage: creating table by templates
Merge branch 'master' of homeproj.cesnet.cz:/var/reps/git/ipfixcol
JSON storage: fixed formatting
JSON storage: removed unused variable
fastbit storage: checking return value of parse_template
Merge branch 'master' of https://github.com/CESNET/ipfixcol