From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 12 Jan 2010 23:47:49 +0000 (-0700)
Subject: Merge branch 'horde-git' (since 12/23/2009) into master
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=52f06b233e745178d33864c490ccecd0bd501458;p=horde.git

Merge branch 'horde-git' (since 12/23/2009) into master

Conflicts:
	.gitattributes
	.gitignore
---

52f06b233e745178d33864c490ccecd0bd501458
diff --cc .gitattributes
index 3e39a5020,6cecff5eb..dc4196f1c
--- a/.gitattributes
+++ b/.gitattributes
@@@ -1,8 -1,3 +1,9 @@@
  # Add tracking hash to config files
--/*/config/conf.xml  ident
--/*/config/*.dist    ident
++*/config/conf.xml  ident
++*/config/*.dist    ident
 +
 +# Ignore CRLF
 +framework/iCalendar/docs/examples/*             -crlf
 +framework/iCalendar/tests/fixtures/*            -crlf
 +framework/iCalendar/tests/fixtures/vTimezone/*  -crlf
++turba/lib/tests/importCRLF.ldif                 -crlf