Merge branch 'master' of 10.3.0.4:public/netxms
authorVictor Kirhenshtein <victor@netxms.org>
Fri, 22 Nov 2013 17:47:19 +0000 (19:47 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Fri, 22 Nov 2013 17:47:19 +0000 (19:47 +0200)

Trivial merge