Merge branch 'develop' v1.2.12
authorVictor Kirhenshtein <victor@netxms.org>
Mon, 17 Feb 2014 13:58:47 +0000 (15:58 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Mon, 17 Feb 2014 13:58:47 +0000 (15:58 +0200)
commit77972e5dfedb21eca63a248c8e6f973316837b25
treee94804d15fa5eda855f14bfe1f763be900b27402
parenteac61b76d45b3e5ae5d7e8d11f7f7f35665e1488
parentc1a5c06c88d7da9c84abf5d49c114a3972c2588a
Merge branch 'develop'