Merge from 3.0 branch till 1264.

1 files changed, 17 insertions, 2 deletions

diff --git a/.gitattributes b/.gitattributes
index 993b0cba..3127d88f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -587,6 +587,7 @@ buildscripts/phing/tasks/XmlLintTask.php -text
 buildscripts/phing/tasks/ZendCodeAnalyzerTask.php -text
 buildscripts/phpbuilder/build.php -text
 buildscripts/setup.php -text
+buildscripts/texbuilder/Page2Tex.php -text
 buildscripts/texbuilder/quickstart/build.php -text
 buildscripts/texbuilder/quickstart/pages.php -text
 buildscripts/texbuilder/quickstart/quickstart.tex -text
@@ -803,8 +804,6 @@ demos/quickstart/protected/pages/Advanced/mastercontent.gif -text
 demos/quickstart/protected/pages/Advanced/mastercontent.vsd -text
 demos/quickstart/protected/pages/Advanced/pcrelation.gif -text
 demos/quickstart/protected/pages/Advanced/pcrelation.vsd -text
-demos/quickstart/protected/pages/Comments.page -text
-demos/quickstart/protected/pages/Comments.php -text
 demos/quickstart/protected/pages/Configurations/AppConfig.page -text
 demos/quickstart/protected/pages/Configurations/Overview.page -text
 demos/quickstart/protected/pages/Configurations/PageConfig.page -text
@@ -1863,6 +1862,10 @@ tests/FunctionalTests/tickets/protected/pages/Ticket239.php -text
 tests/FunctionalTests/tickets/protected/pages/Ticket27.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket28.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket28.php -text
+tests/FunctionalTests/tickets/protected/pages/Ticket284.page -text
+tests/FunctionalTests/tickets/protected/pages/Ticket284.php -text
+tests/FunctionalTests/tickets/protected/pages/Ticket284Component.php -text
+tests/FunctionalTests/tickets/protected/pages/Ticket284Component.tpl -text
 tests/FunctionalTests/tickets/protected/pages/Ticket54.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket54Master.php -text
 tests/FunctionalTests/tickets/protected/pages/Ticket54Master.tpl -text
@@ -1880,6 +1883,7 @@ tests/FunctionalTests/tickets/tests/Ticket191TestCase.php -text
 tests/FunctionalTests/tickets/tests/Ticket21TestCase.php -text
 tests/FunctionalTests/tickets/tests/Ticket239TestCase.php -text
 tests/FunctionalTests/tickets/tests/Ticket27TestCase.php -text
+tests/FunctionalTests/tickets/tests/Ticket284TestCase.php -text
 tests/FunctionalTests/tickets/tests/Ticket28TestCase.php -text
 tests/FunctionalTests/tickets/tests/Ticket54TestCase.php -text
 tests/FunctionalTests/tickets/tests/Ticket72TestCase.php -text
@@ -1926,6 +1930,17 @@ tests/FunctionalTests/validators/tests/RegExpValidatorTestCase.php -text
 tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php -text
 tests/FunctionalTests/validators/tests/RequiredListTestCase.php -text
 tests/FunctionalTests/validators/tests/ValidationSummaryTestCase.php -text
+tests/test_tools/simpletest/collector.php -text
+tests/test_tools/simpletest/compatibility.php -text
+tests/test_tools/simpletest/cookies.php -text
+tests/test_tools/simpletest/detached.php -text
+tests/test_tools/simpletest/exceptions.php -text
+tests/test_tools/simpletest/invoker.php -text
+tests/test_tools/simpletest/reflection_php4.php -text
+tests/test_tools/simpletest/reflection_php5.php -text
+tests/test_tools/simpletest/selector.php -text
+tests/test_tools/simpletest/simpletest.php -text
+tests/test_tools/simpletest/test_case.php -text
 tests/unit/Collections/TListTest.php -text
 tests/unit/Collections/TMapTest.php -text
 tests/unit/I18N/core/CultureInfoTest.php -text