SteveGilvarry b79c2c1604 Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch ...

Conflicts:
	web/skins/classic/views/event.php
	web/skins/classic/views/timeline.php

Also reapplied required PHP Short Tags fix to a event.php and monitor.php that got impacted in merge.

2014-12-25 08:24:48 +10:00

..

ZoneMinder

Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch

2014-12-25 08:24:48 +10:00

ZoneMinder.pm

Migrate svn to git

2013-03-17 00:45:21 +01:00