Merge branch 'master' of 10.3.0.4:public/netxms
authorVictor Kirhenshtein <victor@netxms.org>
Thu, 2 Jan 2014 23:32:41 +0000 (01:32 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Thu, 2 Jan 2014 23:32:41 +0000 (01:32 +0200)
commit9a83e01a5324d13d9ed2d847ca22adf0114a7dfe
treeac84ae57aefe7f7c83efef8c2c97fc10e5ce22de
parentd2acc9eb86432862fa7460d9a9f035cba48ccb1d
parentdfdd7ac42b58e0f665a6530f9021c8c911e9f30b
Merge branch 'master' of 10.3.0.4:public/netxms