Merge branch 'develop' of 10.3.0.4:public/netxms into develop
authorVictor Kirhenshtein <victor@netxms.org>
Mon, 17 Feb 2014 09:55:24 +0000 (11:55 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Mon, 17 Feb 2014 09:55:24 +0000 (11:55 +0200)

Trivial merge