From 6f00b28a1d9c7409c956a83866eac48a9493e83c Mon Sep 17 00:00:00 2001
From: "ctrlaltca@gmail.com" <>
Date: Sat, 21 May 2011 17:10:29 +0000
Subject: branch/3.1: merged bugfixesfrom trunk/ up to r2880; correct
 svn:mergeinfo property

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitattributes')

diff --git a/.gitattributes b/.gitattributes
index 772a2b7d..f31bb494 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2086,6 +2086,7 @@ framework/Caching/TXCache.php -text
 framework/Collections/TAttributeCollection.php -text
 framework/Collections/TDummyDataSource.php -text
 framework/Collections/TList.php -text
+framework/Collections/TListItemCollection.php -text
 framework/Collections/TMap.php -text
 framework/Collections/TPagedDataSource.php -text
 framework/Collections/TPagedList.php -text
-- 
cgit v1.2.3