Merge branch 'develop' of 10.3.0.4:public/netxms into develop
authorVictor Kirhenshtein <victor@netxms.org>
Mon, 20 Jan 2014 10:58:33 +0000 (12:58 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Mon, 20 Jan 2014 10:58:33 +0000 (12:58 +0200)

Trivial merge