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)
commita067c1ac247fdd92645432482a1f10d08bdc7c6a
tree9b573c6755f033180e6c058cce7bcc63f2cfae54
parent987533dbb398ca3fe78394168bdc49e6515dcd04
parent3154b0e926b862cd0cd7db48f7a060ef40a51353
Merge branch 'ups-metasys-driver' into develop