Merge branch 'issue-510' into develop
authorVictor Kirhenshtein <victor@netxms.org>
Fri, 21 Feb 2014 22:39:35 +0000 (00:39 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Fri, 21 Feb 2014 22:39:35 +0000 (00:39 +0200)
1  2 
src/agent/core/nxagentd.cpp
src/agent/core/nxagentd.h

Simple merge
Simple merge