test 1
test1
Merge branch 'master' of github.com:slavmak93/test_system

Conflicts:
	README.txt
	denwer/CONFIGURATION.txt
	denwer/README.txt
	denwer/scripts/Control.bat
	denwer/scripts/Control.pl
	denwer/scripts/README.txt
	denwer/scripts/init.d/!test.pl
	denwer/scripts/init.d/_stub.pl
	denwer/scripts/init.d/apache.pl
	denwer/scripts/init.d/hosts.pl
	denwer/scripts/init.d/mysql.pl
	denwer/scripts/init.d/sendmail.pl
	denwer/scripts/init.d/vdisk.pl
	denwer/scripts/lib/Carp.pm
	denwer/scripts/lib/Carp/Heavy.pm
	denwer/scripts/lib/ExeExportFunc.pm
	denwer/scripts/lib/Exporter.pm
	denwer/scripts/lib/Exporter/Heavy.pm
	denwer/scripts/lib/IO/Socket.pm
	denwer/scripts/lib/Installer.pm
	denwer/scripts/lib/Interface.pm
	denwer/scripts/lib/Net/README.txt
	denwer/scripts/lib/ParseHosts.pm
	denwer/scripts/lib/StartManager.pm
	denwer/scripts/lib/Tools.pm
	denwer/scripts/lib/VhostTemplate.pm
	denwer/scripts/lib/constant.pm
	denwer/scripts/lib/strict.pm
	denwer/scripts/lib/vars.pm
	denwer/scripts/lib/warnings.pm
	denwer/scripts/main/README.txt
	denwer/scripts/reserve/README.txt
	denwer/scripts/reserve/boot/50_inherited
	denwer/tools/sendmail/README.txt
	denwer/tools/sendmail/common.pm
	denwer/tools/sendmail/sendmail.pl
	denwer/tools/sendmail/sendmail_daemon.pl
	denwer/tools/sendmail/sendmail_stub.pl
	denwer/tools/sendmail/sendmail_stub_onefile.pl
	denwer/www/denwer/Tools/addmuser/index.mysql3.php
	denwer/www/denwer/Tools/addmuser/index.php
	denwer/www/denwer/Tools/dnsearch/.htaccess
	denwer/www/denwer/Tools/dnsearch/Conf/mime.types
	denwer/www/denwer/Tools/dnsearch/README.TXT
	denwer/www/denwer/Tools/dnsearch/Tools.pm
	denwer/www/denwer/Tools/dnsearch/index.html
	denwer/www/denwer/Tools/dnsearch/templates/css.css
	denwer/www/denwer/Tools/dnsearch/templates/error_footer.html
	denwer/www/denwer/Tools/dnsearch/templates/error_header.html
	denwer/www/denwer/Tools/dnsearch/templates/footer.html
	denwer/www/denwer/Tools/dnsearch/templates/form.html
	denwer/www/denwer/Tools/dnsearch/templates/header.html
	denwer/www/denwer/Tools/dnsearch/templates/help.html
	denwer/www/denwer/Tools/dnsearch/templates/js.js
	denwer/www/denwer/Tools/dnsearch/templates/search.html
	denwer/www/denwer/Tools/dnsearch/templates/search_footer.html
	denwer/www/denwer/Tools/dnsearch/templates/search_header.html
	denwer/www/denwer/Tools/dnsearch/utils/README.txt
	denwer/www/denwer/Tools/sitelist/index.php
	denwer/www/denwer/_docsearch.htm
	denwer/www/denwer/_footer.php
	denwer/www/denwer/_header.php
	denwer/www/denwer/_lib.php
	denwer/www/denwer/_tests.php
	denwer/www/denwer/_tools.php
	denwer/www/denwer/errors/403.php
	denwer/www/denwer/errors/404.php
	denwer/www/denwer/errors/405.php
	denwer/www/denwer/errors/500.php
	denwer/www/denwer/errors/_pathes.php
	denwer/www/denwer/errors/phperror_js.php
	denwer/www/denwer/index.html
	home/cgi-glob/ssi_test.pl
	home/cgi-glob/test.pl
	home/custom/.htaccess
	home/custom/www/index.php
	home/localhost/cgi-bin/test.pl
	home/localhost/cgi/test.php
	home/localhost/cgi/test.pl
	home/localhost/subdomain/index.html
	home/localhost/subdomain/ssl.php
	home/localhost/www/Tests/PHP5/index.php5
	home/localhost/www/Tests/README.txt
	home/localhost/www/Tests/custom/index.html
	home/localhost/www/Tests/phpMyAdmin/index.html
	home/localhost/www/Tests/phpnotice/index.php
	home/localhost/www/Tests/sendmail/index.php
	home/localhost/www/Tests/ssl/index.html
	home/localhost/www/Tests/subdomain.localhost/index.html
	home/localhost/www/Tests/subdomain.test1.ru/index.html
	home/localhost/www/Tests/test1.ru/index.html
	home/localhost/www/Tools/README.txt
	home/localhost/www/Tools/phpmyadmin/Documentation.txt
	home/localhost/www/Tools/phpmyadmin/examples/config.manyhosts.inc.php
	home/localhost/www/Tools/phpmyadmin/themes/pmahomme/info.inc.php
	home/localhost/www/index.php
	home/test1.ru/cgi/test.pl
	home/test1.ru/subdomain/index.html
	home/test1.ru/www/index.html
	home/testing/www/action.php
	home/testing/www/class.php
	home/testing/www/dbcnnct.php
	home/testing/www/dbcnnct2.php
	home/testing/www/editquest.php
	home/testing/www/index.php
	home/testing/www/loadkurs.php
	home/testing/www/next.php
	home/testing/www/selkurs.htm
	home/testing/www/selkurs.php
	home/testing/www/selquest.php
	home/testing/www/selsubtheme.php
	home/testing/www/seltheme.php
	home/testing/www/start.php
	tmp/README.txt
	usr/local/apache/LICENSE.txt
	usr/local/apache/README-win32.txt
	usr/local/apache/README.txt
	usr/local/apache/bin/Microsoft.VC90.CRT.manifest
	usr/local/apache/conf/extra/httpd-autoindex.conf
	usr/local/apache/conf/extra/httpd-dav.conf
	usr/local/apache/conf/extra/httpd-default.conf
	usr/local/apache/conf/extra/httpd-info.conf
	usr/local/apache/conf/extra/httpd-languages.conf
	usr/local/apache/conf/extra/httpd-manual.conf
	usr/local/apache/conf/extra/httpd-mpm.conf
	usr/local/apache/conf/extra/httpd-multilang-errordoc.conf
	usr/local/apache/conf/extra/httpd-ssl.conf
	usr/local/apache/conf/extra/httpd-userdir.conf
	usr/local/apache/conf/extra/httpd-vhosts.conf
	usr/local/apache/conf/httpd.conf
	usr/local/apache/conf/magic
	usr/local/apache/conf/mime.types
	usr/local/apache/conf/vhosts.conf
	usr/local/apache/icons/README
	usr/local/apache/icons/README.html
	usr/local/apache/logs/README.txt
	usr/local/apache/logs/access.log
	usr/local/apache/logs/error.log
	usr/local/apache/modules/Microsoft.VC90.CRT.manifest
	usr/local/miniperl/README.txt
	usr/local/miniperl/miniperl_test.bat
	usr/local/mysql-5.5/data/README.txt
	usr/local/mysql-5.5/data/ib_logfile0
	usr/local/mysql-5.5/data/ibdata1
	usr/local/mysql-5.5/data/mysql/db.MYD
	usr/local/mysql-5.5/data/mysql/db.MYI
	usr/local/mysql-5.5/data/phpmyadmin/pma_recent.MYD
	usr/local/mysql-5.5/data/phpmyadmin/pma_recent.MYI
	usr/local/mysql-5.5/data/phpmyadmin/pma_table_uiprefs.MYD
	usr/local/mysql-5.5/data/phpmyadmin/pma_table_uiprefs.MYI
	usr/local/mysql-5.5/data/phpmyadmin/pma_userconfig.MYD
	usr/local/mysql-5.5/data/phpmyadmin/pma_userconfig.MYI
	usr/local/mysql-5.5/data/testing/answers.MYD
	usr/local/mysql-5.5/data/testing/answers.MYI
	usr/local/mysql-5.5/data/testing/answers.frm
	usr/local/mysql-5.5/data/testing/checking.MYD
	usr/local/mysql-5.5/data/testing/checking.MYI
	usr/local/mysql-5.5/data/testing/checking.frm
	usr/local/mysql-5.5/data/testing/questions.MYD
	usr/local/mysql-5.5/data/testing/questions.MYI
	usr/local/mysql-5.5/data/testing/questions.frm
	usr/local/mysql-5.5/data/testing/subthemes.MYD
	usr/local/mysql-5.5/data/testing/subthemes.MYI
	usr/local/mysql-5.5/data/testing/test_questions.MYD
	usr/local/mysql-5.5/data/testing/test_questions.MYI
	usr/local/mysql-5.5/data/testing/test_questions.frm
	usr/local/mysql-5.5/data/testing/testing.MYD
	usr/local/mysql-5.5/data/testing/testing.MYI
	usr/local/mysql-5.5/data/testing/testing.frm
	usr/local/mysql-5.5/data/testing/themes.MYD
	usr/local/mysql-5.5/data/testing/themes.MYI
	usr/local/mysql-5.5/data/testing/user_roles.MYD
	usr/local/mysql-5.5/data/testing/user_roles.MYI
	usr/local/mysql-5.5/data/testing/user_subjects.MYD
	usr/local/mysql-5.5/data/testing/user_subjects.MYI
	usr/local/mysql-5.5/data/testing/user_subjects.frm
	usr/local/mysql-5.5/data/testing/users.MYD
	usr/local/mysql-5.5/data/testing/users.MYI
	usr/local/mysql-5.5/data/testing/users.frm
	usr/local/mysql-5.5/my.ini
	usr/local/php5/Microsoft.VC90.CRT.manifest
	usr/local/php5/ext/Microsoft.VC90.CRT.manifest
	usr/local/php5/license.txt
	usr/local/php5/php.ini