modified:   ihostlist
	modified:   plnode/protocol/plexus/plexus_protocol.h
Merge branch 'master' of github.com:srcvirus/klink

Conflicts:
	agent
	ihostlist
	modified:   ihostlist