Merge branch 'master' into fis
authorVictor Kirhenshtein <victor@netxms.org>
Thu, 20 Feb 2014 18:12:32 +0000 (20:12 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Thu, 20 Feb 2014 18:12:32 +0000 (20:12 +0200)

Trivial merge