tree d4c23836931ae859a95e1c62246a1618ae0338df
parent 3319df6f3aa3271124847e2c91c7e6d0be961bc6
parent caa7dac163f7f7fc827da6fd4a5aba259a50e1ab
author Junio C Hamano <gitster@pobox.com> 1256510081 -0700
committer Junio C Hamano <gitster@pobox.com> 1256510081 -0700

Merge branch 'maint-1.6.4' into maint

* maint-1.6.4:
  ls-files: excludes should not impact tracked files