Merge branch 'master' of git.netxms.org:public/netxms
authorAlex Kirhenshtein <alk@netxms.org>
Thu, 7 Nov 2013 15:49:05 +0000 (17:49 +0200)
committerAlex Kirhenshtein <alk@netxms.org>
Thu, 7 Nov 2013 15:49:05 +0000 (17:49 +0200)
commit4d99a8356cfbcb6216bc9b04789531b058e034ff
treeeb2ea1d6d789566df31d732da10cf373fb979968
parent8b1de1ccbcf292680becf3c2ded2da8b0a6ae9e9
parentf7f1613c5aa108632afa2e3c9465ed5b6d99a556
Merge branch 'master' of git.netxms.org:public/netxms