Merge pull request #4 from champtar/zabbix
authorsbyx <steven@midlink.org>
Wed, 4 Jun 2014 11:57:00 +0000 (13:57 +0200)
committersbyx <steven@midlink.org>
Wed, 4 Jun 2014 11:57:00 +0000 (13:57 +0200)
Zabbix


Trivial merge