Merge branch 'develop' of github.com:ZoneMinder/ZoneMinder into develop
delete generated files
Merge branch 'release-1.26' into develop

Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm
Merge pull request #111 from chriswiggins/master

Use GitHub repo for version check
Forgot to bump the version number for 1.26.1.  Fixes #113
update link to README to be README.md
remove autogenerated files
Merge branch 'develop' of github.com:ZoneMinder/ZoneMinder into develop

Conflicts:
	scripts/zmupdate.pl
Modify zmupdate for 1.26.1 and 1.26.2 releases
modify zmupdate.pl.in
Merge pull request #116 from knnniggett/zmupdate_newrelease

Add 1.26.1 and 1.26.2 releases to zmupdate
rough in a quick script to help people generate the build files
Merge remote-tracking branch 'origin/develop'
Point to the GitHub issues page for the list of current bugs
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
Updated AUTHORS to reflect recent changes to the project
put this back so we can get on with life
Fixed greyscale four field deinterlacing not processing last line, broken ssse3 color->greyscale conversion and improved error handling when reading\decoding jpegs
Bumping the version numbers.
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into mybranch