Merge branch 'redhat'
Merge remote branch 'upstream/master'
Merge branch 'master', remote branch 'upstream/master'
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
Update zm_remote_camera.h
Update zm_remote_camera.cpp
Update zm_remote_camera_http.cpp
Update zm_remote_camera_http.cpp
Added alarm blend percent (useful for controlling how long an alarm lasts) and a dropdown list is used now if ZM_FAST_IMAGE_BLENDS is enabled
remove extra stuff that I don't think we need because we are the source.
Also unconditionally call zmupdate.pl since it should do all the checking of versions to see if anything needs doing.
We don't need to be doing that work in a postinst bash script.
Remove the ZM_BLEND_ALARMED_IMAGES option (not needed anymore, global per monitor now)
Changed default blend percentages and the dropdown list for alarm reference image blend
bump version # for snapshot
very sub-optimisation, removing duplicate comparisons
Update zoneminder.service

Added "After=" rule to [unit] section to prevent Zoneminder from starting before mysqld.
Merge pull request #246 from dtmf/patch-1

Add "After=" rule to prevent ZoneMinder from starting before mysqld (fedora)
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
handle bad config lines better
fix assigning DB_TYPE