only do mmap on demand
fix problem editing users, a semi-colon screwed up the if statement.
Also change behaviour so that if a user is specified, and doesn't load, generate an error.
This also removes a search for empty user id in the db
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
Modified zmlinkconent.sh.in to chown and chmod content folder. Fixes #463
Merge pull request #465 from SteveGilvarry/463-chown-chmod-Content-dir

Modified zmlinkcontent to chown and chmod content folder. Fixes #463
I don't know why this never has the right # of coumns, so let's be specific
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
add curl dependencies
increase max_socket_tries to 10 as #470
move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera
change the way v4l_multi_buffer is loaded.  Since t's a bool, it theoretically is 1 byte, so can't use atoi
fix
add Makefile to ignores
ensure captures_per_frame >0
add missing lang entries for MultiBuffer and CapturesPerFrame
change mysql-server to Recommends
Update FI9821W_Y2k.pm

Fixed this issue:
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 138.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 141.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 144.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 154.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 156.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 195.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 222.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 247.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 275.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 302.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 329.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 356.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 383.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 399.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 414.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 448.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 671.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 690.
Merge pull request #485 from florian-asche/patch-1

Update FI9821W_Y2k.pm
add the word disabled after function if the monitor is not enabled.
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
the var is remSockFile, not remSocketFile