Merge branch 'develop' into fis
authorVictor Kirhenshtein <victor@netxms.org>
Thu, 6 Feb 2014 18:37:41 +0000 (20:37 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Thu, 6 Feb 2014 18:37:41 +0000 (20:37 +0200)
commit4b95b3de9d12ce97e983831c0531464cdd7a1b05
treeb9211c49e896abadda9aca5499df97507629422a
parent5f65983ce998bd5f4daddeb7557d024ec5fdea0a
parent5cc458cbc867b6d863ef516775e8c6abf41867f2
Merge branch 'develop' into fis