Merge branch 'develop' of 10.3.0.4:public/netxms into develop
authorVictor Kirhenshtein <victor@netxms.org>
Thu, 20 Feb 2014 15:17:16 +0000 (17:17 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Thu, 20 Feb 2014 15:17:16 +0000 (17:17 +0200)

Trivial merge