Merge branch 'develop' of git.netxms.org:public/netxms into develop
authorMarco Incalcaterra <marco.incalcaterra@thinksoft.it>
Thu, 25 Feb 2016 20:02:03 +0000 (21:02 +0100)
committerMarco Incalcaterra <marco.incalcaterra@thinksoft.it>
Thu, 25 Feb 2016 20:02:03 +0000 (21:02 +0100)

Trivial merge