Merge branch 'develop'
authorVictor Kirhenshtein <victor@netxms.org>
Mon, 17 Feb 2014 11:46:59 +0000 (13:46 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Mon, 17 Feb 2014 11:46:59 +0000 (13:46 +0200)
commiteac61b76d45b3e5ae5d7e8d11f7f7f35665e1488
treedb1c5d877f7a5f936f98872bf3bf1c4fda07ccf5
parentbf294394d238e8bb230cefefde0416f9000642be
parenta8846140d0238377ceb5eb71cb7ccda3339a8098
Merge branch 'develop'