Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
Move debian folder under distros
Merge branch 'debian' of https://github.com/knnniggett/ZoneMinder into knnniggett-debian
Can't seem to catch a break tonight.  Moving dian files into correct folder.
Merge branch 'debian2' of https://github.com/knnniggett/ZoneMinder into knnniggett-debian2
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
Merge branch 'dukess-master' into v1.26.4-beta

Conflicts:
	scripts/zmupdate.pl.in
blah
Improve Chrome browser support & log streaming events
Add fedora files to zoneminder source tree
Fixing postinst script and changelog needed for successful debian build
Fixing debian control file (libjpeg-turbo8 -> libjpeg8)
fixing debian docs file (README -> README.md)
Initial commit of .travis.yml file, hopefully this builds.
Added IRC notifications to .travis.yml
cd back into the ZM dir, and run make after config
Merge pull request #163 from knnniggett/fedora

Add fedora rpm development files to zoneminder source tree
Merge pull request #162 from knnniggett/streaming

Improve Chrome browser support & log streaming events
Trying to find the correct directory where the ZM clone lives
Run as many make jobs as there are CPUs for the ffmpeg build