Zabbix

........S. [ZBX-11980] Revert the patch for trunk

The patch ported for trunk need more work, no conflicts appeared during merge,
but the build of the trunk was broken.

[svn merge -c -r66945 .]