Merge branch 'master' of 10.3.0.4:public/netxms
authorVictor Kirhenshtein <victor@netxms.org>
Fri, 13 Dec 2013 16:53:29 +0000 (18:53 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Fri, 13 Dec 2013 16:53:29 +0000 (18:53 +0200)

Trivial merge