Merge branch 'develop' of 10.3.0.4:public/netxms into develop
authorVictor Kirhenshtein <victor@netxms.org>
Wed, 26 Feb 2014 10:11:51 +0000 (12:11 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Wed, 26 Feb 2014 10:11:51 +0000 (12:11 +0200)

Trivial merge