Merge branch 'master' of 10.3.0.4:public/netxms
authorVictor Kirhenshtein <victor@netxms.org>
Fri, 10 Jan 2014 15:35:57 +0000 (17:35 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Fri, 10 Jan 2014 15:35:57 +0000 (17:35 +0200)

Trivial merge