Merge branch 'develop' of git.netxms.org:public/netxms into develop
authorMarco Incalcaterra <marco.incalcaterra@thinksoft.it>
Wed, 4 Mar 2015 15:57:05 +0000 (16:57 +0100)
committerMarco Incalcaterra <marco.incalcaterra@thinksoft.it>
Wed, 4 Mar 2015 15:57:05 +0000 (16:57 +0100)

Trivial merge