Merge branch 'develop'
authorVictor Kirhenshtein <victor@netxms.org>
Mon, 17 Feb 2014 11:46:59 +0000 (13:46 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Mon, 17 Feb 2014 11:46:59 +0000 (13:46 +0200)

Trivial merge