modified:   copy_script.sh
	modified:   ihostlist
Merge branch 'master' of git://github.com/srcvirus/klink
Merge branch 'master' of git://github.com/srcvirus/klink
	modified:   plnode/message/message.h
	new file:   plnode/message/p2p/message_cache_me.h
	modified:   plnode/protocol/plexus/plexus_message_processor.h
	modified:   plnode/protocol/plexus/plexus_protocol.h
	modified:   server_system_test.cc
Merge branch 'master' of git://github.com/srcvirus/klink

Conflicts:
	agent
	plnode/protocol/plexus/plexus_message_processor.h
	server_system_test.cc

	modified:   client_system_test.cc
	modified:   config
	modified:   imonitorlist
	modified:   plnode/logging/log.h
	new file:   plnode/message/control/log_force_message.h
	modified:   plnode/message/control/peer_start_message.h
	modified:   plnode/message/message.h
	modified:   plnode/protocol/plexus/plexus_message_processor.h
	modified:   plnode/protocol/plexus/plexus_protocol.h
	modified:   server_system_test.cc