Merge branch 'develop' of git.netxms.org:public/netxms into develop
authorMarco Incalcaterra <marco.incalcaterra@thinksoft.it>
Thu, 30 Jan 2014 07:17:54 +0000 (08:17 +0100)
committerMarco Incalcaterra <marco.incalcaterra@thinksoft.it>
Thu, 30 Jan 2014 07:17:54 +0000 (08:17 +0100)

Trivial merge