Merge branch 'develop' into fis
authorVictor Kirhenshtein <victor@netxms.org>
Thu, 6 Feb 2014 18:37:41 +0000 (20:37 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Thu, 6 Feb 2014 18:37:41 +0000 (20:37 +0200)

Trivial merge