Merge branch 'develop' of git.netxms.org:public/netxms into develop
authorVictor Kirhenshtein <victor@netxms.org>
Wed, 26 Feb 2014 10:44:11 +0000 (12:44 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Wed, 26 Feb 2014 10:44:11 +0000 (12:44 +0200)
commit7b9b8a044627dd83697f0267eb5850b7858b8cb6
tree0eaae5e96d727f4223fa4f03faf3af92d8c70a78
parente2d4afc778a4aae35e189e65496bccfe43462e23
parentb87a613b0a13eab6cbd1d6cbcf8625326ce9fb6b
Merge branch 'develop' of git.netxms.org:public/netxms into develop