Merge branch 'master' of 10.3.0.4:public/netxms
authorVictor Kirhenshtein <victor@netxms.org>
Fri, 29 Nov 2013 16:32:52 +0000 (18:32 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Fri, 29 Nov 2013 16:32:52 +0000 (18:32 +0200)
commit0a5afbe60b8474589d938e84a310c4260c8307de
tree54914df32fd660d17a0a11a844ab259a7545a6a8
parente02953a4c1416751ebf0bdb154a0b7f92206551b
parent2b479c921070ab4b3b92daf13ab051683f891fc5
Merge branch 'master' of 10.3.0.4:public/netxms

Conflicts:
ChangeLog
ChangeLog