Merge branch 'master' of 10.3.0.4:public/netxms
authorVictor Kirhenshtein <victor@netxms.org>
Thu, 7 Nov 2013 08:41:00 +0000 (10:41 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Thu, 7 Nov 2013 08:41:00 +0000 (10:41 +0200)
commit9e58934ddc70ae8ecea49a57f7a7c991b9342153
tree8bf9ebea00a7496821e81f5a88eedf9f640c2fa3
parentf47bd4cac31a479be062c0d1a626af81f2ab17c1
parent82287ba1b9c2f145baec87728aa4a3beab94cdaa
Merge branch 'master' of 10.3.0.4:public/netxms