tree f3405fe2afe9542f5c64fbfe749fac76fb5000bf
parent 2f76919517e98bb5e979d6c8c7bbc3478a066a21
parent 6df42ab98480dcac473ca7d701cfca4a0051d0c1
author Junio C Hamano <gitster@pobox.com> 1285793271 -0700
committer Junio C Hamano <gitster@pobox.com> 1285793271 -0700

Merge branch 'po/etc-gitattributes'

* po/etc-gitattributes:
  Add global and system-wide gitattributes

Conflicts:
	Documentation/config.txt
	Makefile