Merge branch 'cc-2281-Install-script-should-check-for-pre-installed-versions-and-prompt-user-to-upgrade/full-installation' of dev.sourcefabric.org:campcaster into cc-2281-Install-script-should-check-for-pre-installed-versions-and-prompt-user-to-upgrade/full-installation

Conflicts:
	install/airtime-install.php
This commit is contained in:
Naomi 2011-05-20 14:12:33 -04:00
commit 8eaf05704e

Diff content is not available