From 17f49a9bc71d88c9b3e2f31a161f3689c136ac16 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Fri, 1 Dec 2006 12:28:55 +0000
Subject: merge from 3.0 branch till 1531.

---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.gitattributes')

diff --git a/.gitattributes b/.gitattributes
index 5b8a157e..665367a7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2234,6 +2234,7 @@ tests/FunctionalTests/tickets/protected/pages/Ticket311.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket312.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket351.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket453.page -text
+tests/FunctionalTests/tickets/protected/pages/Ticket463.page -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
@@ -2256,6 +2257,7 @@ tests/FunctionalTests/tickets/tests/Ticket27TestCase.php -text
 tests/FunctionalTests/tickets/tests/Ticket284TestCase.php -text
 tests/FunctionalTests/tickets/tests/Ticket285TestCase.php -text
 tests/FunctionalTests/tickets/tests/Ticket28TestCase.php -text
+tests/FunctionalTests/tickets/tests/Ticket463TestCase.php -text
 tests/FunctionalTests/tickets/tests/Ticket54TestCase.php -text
 tests/FunctionalTests/tickets/tests/Ticket72TestCase.php -text
 tests/FunctionalTests/tickets/tests/Ticket93TestCase.php -text
-- 
cgit v1.2.3