Merge branch 'develop' of git.netxms.org:public/netxms into develop
authorVictor Kirhenshtein <victor@netxms.org>
Wed, 26 Feb 2014 10:44:11 +0000 (12:44 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Wed, 26 Feb 2014 10:44:11 +0000 (12:44 +0200)

Trivial merge