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

Conflicts:
	.gitattributes
	.gitignore

diff --cc .gitattributes
index 3e39a50,6cecff5..dc4196f
--- 1/.gitattributes
--- 2/.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