Merge branch 'master' of 10.3.0.4:public/netxms
authorVictor Kirhenshtein <victor@netxms.org>
Wed, 8 Jan 2014 06:51:15 +0000 (08:51 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Wed, 8 Jan 2014 06:51:15 +0000 (08:51 +0200)

Trivial merge