blag
change the way v4l_multi_buffer is loaded.  Since t's a bool, it theoretically is 1 byte, so can't use atoi
fix
Merge ../ZoneMinder.master into iconnor

Conflicts:
	src/zm_monitor.cpp
add Makefile to ignores
ensure captures_per_frame >0
add missing lang entries for MultiBuffer and CapturesPerFrame
Merge ../ZoneMinder.master into iconnor
blah
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
fixes to streamUrl
Merge ../ZoneMinder.master into iconnor

Conflicts:
	distros/ubuntu1204/control
	web/skins/classic/views/console.php