0a98b7fffdfa9cca40442160f396481b8a55164c 71d15136c6d0c7db43a523dcb2dad6b8a9fbeaf0 Hongli Lai (Phusion) hongli@phusion.nl http://github.com/FooBarWidget/passenger/commit/9e1994106d9b6cd0068cff3cc8d835b8e8303bc0 9e1994106d9b6cd0068cff3cc8d835b8e8303bc0 2009-02-03T01:04:04-08:00 2009-02-03T01:04:04-08:00 Merge branch 'change_namespace' into nginx_change_namespace Conflicts: .gitignore Rakefile bin/passenger-install-apache2-module lib/passenger/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb lib/passenger/templates/apache2/config_snippets.txt.erb lib/passenger/templates/apache2/no_write_permission_to_passenger_root.txt.erb lib/passenger/templates/apache2_config_snippets.txt.erb lib/passenger/templates/apache_must_be_compiled_with_compatible_mpm.txt.erb lib/passenger/templates/deployment_example.txt.erb lib/passenger/templates/nginx/deployment_example.txt.erb lib/passenger/templates/nginx/possible_solutions_for_compilation_and_installation_problems.txt.erb lib/passenger/templates/nginx/run_installer_as_root.txt.erb lib/passenger/templates/nginx/welcome.txt.erb lib/passenger/templates/no_write_permission_to_passenger_root.txt.erb lib/passenger/templates/possible_solutions_for_compilation_and_installation_problems.txt.erb lib/passenger/templates/run_installer_as_root.txt.erb lib/passenger/templates/welcome.txt.erb lib/phusion_passenger/templates/apache2_config_snippets.txt.erb lib/phusion_passenger/templates/apache_must_be_compiled_with_compatible_mpm.txt.erb lib/phusion_passenger/templates/deployment_example.txt.erb lib/phusion_passenger/templates/no_write_permission_to_passenger_root.txt.erb lib/phusion_passenger/templates/possible_solutions_for_compilation_and_installation_problems.txt.erb lib/phusion_passenger/templates/run_installer_as_root.txt.erb lib/phusion_passenger/templates/welcome.txt.erb 12ef8be7f830a76eade67ec655056764b9116745 Hongli Lai (Phusion) hongli@phusion.nl