Merge branch 'master' into fis
authorVictor Kirhenshtein <victor@netxms.org>
Thu, 20 Feb 2014 18:12:32 +0000 (20:12 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Thu, 20 Feb 2014 18:12:32 +0000 (20:12 +0200)
commitcd9bba39b50e713723c30cdf67ab74b2e18a2b3b
treee94804d15fa5eda855f14bfe1f763be900b27402
parent4b95b3de9d12ce97e983831c0531464cdd7a1b05
parent77972e5dfedb21eca63a248c8e6f973316837b25
Merge branch 'master' into fis