Merge branch 'master' of 10.3.0.4:public/netxms
authorVictor Kirhenshtein <victor@netxms.org>
Fri, 27 Dec 2013 21:30:08 +0000 (23:30 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Fri, 27 Dec 2013 21:30:08 +0000 (23:30 +0200)
commit0a05ffd218b40a87a2652a696da3132484ae9766
treea628cd2d5611c5dc26ea4e12ed0c19efe1aa64e9
parentc7f9f4a4c412f729dcbbfb9c53d5eda6670ea4fb
parentded3cd33f9df79c7530040d27645e9777580dfd8
Merge branch 'master' of 10.3.0.4:public/netxms