Merge remote branches 'origin' and 'origin/master'
Merge remote branches 'origin' and 'origin/master'
Mon Sep 16 12:30:31 MDT 2013

Database:
  Schema:
    Views:
      viewInventoryComputers: Added date conversion from UNIX_TIMESTAMP to UTC format.
      viewInventoryMonitors: Added date conversion from UNIX_TIMESTAMP to UTC format.
      viewInventoryModels: Added date conversion from UNIX_TIMESTAMP to UTC fromat