Merge branch 'master' of git.netxms.org:public/netxms
authorAlex Kirhenshtein <alk@netxms.org>
Thu, 7 Nov 2013 15:49:05 +0000 (17:49 +0200)
committerAlex Kirhenshtein <alk@netxms.org>
Thu, 7 Nov 2013 15:49:05 +0000 (17:49 +0200)

Trivial merge