Merge branch 'develop' of github.com:ZoneMinder/ZoneMinder into develop
delete generated files
Update zmupdate.pl.in to give option to convert to InnoDB tables

When upgrading the zoneminder database to 1.26, this proposed change will ask the user to convert existing MyISAM tables over InnoDB.  It first scans for existing MyISAM tables and will skip over any tables that are already converted to InnoDB.

I've tested this on (a copy of) a production database server and have verified it doesn't alter existing tables from a different schema.

And I'm done messing with the zmupdate script. I promise.
I understand if this change is considered outside the scope of a current bug fix release.
Adds PTZ controls & camera presets for specific cameras. (NOTE TO SELF: remove ~ files)
This adds PTZ control files and camera presets for specific ptz cameras.
edit zmupdate function in init script

Noticed the init script was looking for a zm_update, which doesn't exist.  My best guess is that this should be changed to zmupdate.pl. This causes zoneminder to reload its configuration from the database prior to startup. Thoughts?
Merge pull request #87 from knnniggett/patch-6

edit zmupdate function in init script
Add PTZ control files and camera presets for specific ptz cameras
Merge pull request #85 from knnniggett/addptzcameras

Add PTZ control files and presets for FOSCAM FI8608W PT, FI8620 PTZ, 9821W PTZ and Loftek Sentinel IP
Fixed typo

line 614 was missing a trailing semicolon
Merge pull request #89 from knnniggett/patch-7

Fixed typo
Fix for Issue #88 - ZMS crashing

Previously, systems without gnutls were computing auth_md5 to be twice the size of what it was defined to be, thus causing zms to crash. The for loop at line 227 builds auth_md5 by looping every "2j", which means the upper limit (md5len) should be half the desired size of auth_md5.
Merge pull request #90 from knnniggett/patch-8

zms crashes with hashed authentication - fixes #88

Previously, systems without gnutls were computing auth_md5 to be twice the size of what it was defined to be, thus causing zms to crash. The for loop at line 227 builds auth_md5 by looping every "2j", which means the upper limit (md5len) should be half the desired size of auth_md5.
Update getBrowser() to match IE10

Updates the preg_match expression to match Internet Explorer 10. The previous pattern would not detect IE10, and hence zoneminder would not attempt to stream via Cambozola, which leaves IE10 users looking at a broken link.

NOTE: There is another file in the zoneminder source tree, AssetDispatcher.php, that also uses the same pattern match expression.  It is part of the Cake folder, which I am not familiar with.  Please advise if we should edit that file as well.
Fix "Can't stat : No such file or directory" message

Many zoneminder systems have a "Can't stat : No such file or directory" in their logs each time zmfix is run. The problem was traced back to the sql query, which looked for a ControlDevice field that was not null.  However, the ControlDevice field is empty, rather than null, when there is no control device.
Merge pull request #84 from knnniggett/patch-5

Update zmupdate.pl.in to give option to convert to InnoDB tables
Merge pull request #95 from knnniggett/patch-10

Fix "Can't stat : No such file or directory" message
Resolving CVE-2013-0232 - this should fix #93.
Fixing AM_CONFIG_HEADER is deprecated in automake > 1.13.  Should fix #94.
Merge pull request #92 from knnniggett/patch-9

Update getBrowser() to match IE10