Merge branch 'ups-metasys-driver' into develop
authorVictor Kirhenshtein <victor@netxms.org>
Sun, 2 Feb 2014 21:26:04 +0000 (23:26 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Sun, 2 Feb 2014 21:26:04 +0000 (23:26 +0200)

Trivial merge