Merge branch 'master' of 10.3.0.4:public/netxms
authorVictor Kirhenshtein <victor@netxms.org>
Fri, 13 Dec 2013 16:53:29 +0000 (18:53 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Fri, 13 Dec 2013 16:53:29 +0000 (18:53 +0200)
commit175ad042d9b7bbe1253d7d1f44f4ab4bae3eb456
treed3457c62b3e00cd809ca368244a031dae15ff0b5
parent290534535107ca41b8dd27bfdc0920f62d182936
parente0a77f080c7dea0bdaac7f3fc1bc25a847cefb92
Merge branch 'master' of 10.3.0.4:public/netxms