Merge branch 'master' of 10.3.0.4:public/netxms
authorVictor Kirhenshtein <victor@netxms.org>
Thu, 19 Dec 2013 11:51:33 +0000 (13:51 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Thu, 19 Dec 2013 11:51:33 +0000 (13:51 +0200)

Trivial merge