Update zm_remote_camera.h
Update zm_remote_camera.cpp
Update zm_remote_camera_http.cpp
Update zm_remote_camera_http.cpp
Fixed not installing mootools symlinks in an out-of-source build
Fix make install failing to install mootools symlinks in an out-of-source build
Merge branch 'cmakemootoolsfix'
add ServerHost filter
Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO
Merge branch 'mysql2PDO' into iconnor
cleanups, only connect and disconnect once.  Remove unncessary require's of DBI
cleanup MyISAM to InnoDB code
Merge branch 'betterInnoDBupdate' of ../ZoneMinder.master into iconnor

Conflicts:
	scripts/zmupdate.pl.in
fixup zmupdate.pl.in
Merge pull request #251 from ZoneMinder/betterInnoDBupdate

InnoDB upgrae and DB connection improvements to zmupdate.pl
Remove importing of binary directory in cmakecacheimport.sh
Add automatic finding of the ffmpeg executable to cmake
Few minor cmake improvements, especially for whitespaces in paths
Remove round() mess
Put CMAKE_INCLUDE_CURRENT_DIR back in
Fix minor bug introduced by commit cfc9a73851: Do not install mootools symlinks twice for out-of-source installations