Merge branch 'master' of 10.3.0.4:public/netxms
authorVictor Kirhenshtein <victor@netxms.org>
Thu, 7 Nov 2013 08:41:00 +0000 (10:41 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Thu, 7 Nov 2013 08:41:00 +0000 (10:41 +0200)

Trivial merge