[1390] Merge branch 'master' into trac1390 with fixing conflicts:
src/bin/xfrout/tests/xfrout_test.py.in src/bin/xfrout/xfrout.py.in src/bin/xfrout/xfrout_messages.mes
compatcheck/Makefile.am
0 → 100644
compatcheck/README
0 → 100644
No preview for this file type