Merge branch 'RTSP_mUrl' of https://github.com/knnniggett/ZoneMinder into iconnor
incremement release #
Merge branch 'master' into iconnor

Conflicts:
	src/zm_config.cpp
Increment release
Merge branch 'iconnor' of github.com:ZoneMinder/ZoneMinder into iconnor

Conflicts:
	distros/ubuntu1204/changelog
Merge branch 'master' into iconnor

Conflicts:
	web/includes/functions.php
	web/skins/classic/includes/functions.php
	web/skins/classic/views/console.php
	web/skins/classic/views/event.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/montage.php
Merge branch 'iconnor' of github.com:ZoneMinder/ZoneMinder into iconnor

Conflicts:
	web/includes/functions.php
	web/skins/classic/includes/functions.php
	web/skins/classic/views/console.php
	web/skins/classic/views/event.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/montage.php