no message
Merge branch 'master' of github.com:yves-vogl/zbxapi

Conflicts:
	lib/zbxapi.rb