Zabbix

........S. [ZBX-9623] fix possible SQL error when network discovery rule and LLD rule are processed at the same time (dimir)
	   [svn merge ^/branches/2.4 -c r5412] resolve conflicts in lld_triggers_save()