Summary of changes: 950dc8a... Remove zabbix directory, showing up in zabbixsrv home direc (*) efe8e23... Solve conflict between proxy, server and base package (*) (*) This commit already existed in another branch; no separate mail sent