Merge branch 'develop' of git.netxms.org:public/netxms into develop
authorMarco Incalcaterra <marco.incalcaterra@thinksoft.it>
Thu, 30 Jan 2014 07:17:54 +0000 (08:17 +0100)
committerMarco Incalcaterra <marco.incalcaterra@thinksoft.it>
Thu, 30 Jan 2014 07:17:54 +0000 (08:17 +0100)
commit8bef21d77a12ef8220c110c1dc504c70a574e353
tree92eb4805fc2bb34f8cd7d0588cdc0baefa976d02
parent683fd0a210ade134b51db42a22c68fbd9c35d67e
parent54aa9c6fa93f9f4e391de6d92c535f8963a0cee2
Merge branch 'develop' of git.netxms.org:public/netxms into develop