ZoneMinder/ZoneMinder — pull request #532 by SteveGilvarry (2014-10-12 09:33:00+00:00)
Title: Merge master to feature-h264-videostorage and restore web GUI

Merged master a couple of times here and from #430, so thanks to @fullTalgoRythm for those fixes. Also brought web gui back in and cherry picked some content from https://github.com/fullTalgoRythm/ZoneMinder/tree/h264-video-playback. This should make the branch viable again.