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)
commit5340d8624b4fa82c36ee6abd50b741bc2e32c54a
tree56e47540bbf6fa5034c6fdc0d429b729ad4b9087
parentd2312ae4eaf912fac87d211161ccaa8c4654d06b
parent22f3862753530b3a57b60c3d55279b443af44424
Merge branch 'develop' of git.netxms.org:public/netxms into develop