Merge branch 'master' of 10.3.0.4:public/netxms
authorVictor Kirhenshtein <victor@netxms.org>
Mon, 6 Jan 2014 15:36:38 +0000 (17:36 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Mon, 6 Jan 2014 15:36:38 +0000 (17:36 +0200)

Trivial merge