Merge branch 'develop' of git.netxms.org:public/netxms into develop
authorMarco Incalcaterra <marco.incalcaterra@thinksoft.it>
Thu, 7 Jan 2016 12:46:14 +0000 (13:46 +0100)
committerMarco Incalcaterra <marco.incalcaterra@thinksoft.it>
Thu, 7 Jan 2016 12:46:14 +0000 (13:46 +0100)

Trivial merge