[zoneminder/el7] (3 commits) ...Merge branch 'master' into el7
Summary of changes:
49d45f8... Rebuilt for new ffmpeg snapshot (*)
3adc6c3... 1.36.11 release (*)
eed12cc... Merge branch 'master' into el7
(*) This commit already existed in another branch; no separate mail sent