Merge branch 'master' of 10.3.0.4:public/netxms
authorVictor Kirhenshtein <victor@netxms.org>
Mon, 18 Nov 2013 10:27:21 +0000 (12:27 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Mon, 18 Nov 2013 10:27:21 +0000 (12:27 +0200)

Trivial merge