Merge branch 'master' of 10.3.0.4:public/netxms
authorzev <zev@radensolutions.com>
Fri, 8 Nov 2013 12:00:06 +0000 (14:00 +0200)
committerzev <zev@radensolutions.com>
Fri, 8 Nov 2013 12:00:06 +0000 (14:00 +0200)

Trivial merge