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)
commitf4af2137891f179b4b546a48449687aaf0b3c520
treed57d68bd1855de4a6b1ced46769bcb1ae5d119a5
parent5340d8624b4fa82c36ee6abd50b741bc2e32c54a
parentf19168bd65d07a98eead34d96af1d29e3933976f
Merge branch 'develop' of git.netxms.org:public/netxms into develop