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)
commitf89777f05aabe508824e3cf03ae239529248ce13
tree4d63f12cdad816f67dce7f3e836987f129431414
parenta8497ce86e962a56c0f6f740a4cf489a749a7099
parent914eb859442cb091b900a4904b0d7b3fbf069a9f
Merge branch 'develop' of git.netxms.org:public/netxms into develop