Merge branch 'maint-1.6.0' into maint
commit4f8b8992ef0c009822cdca18d32ddf3a124ee284
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Jan 2009 07:10:50 +0000 (13 23:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Jan 2009 07:10:50 +0000 (13 23:10 -0800)
treed6688aedd217cdd9f46962af57432265e9b5ccff
parent885a1ffb936cb8e32a15413a9a2404a4b4200f62
parent3d1d81eba29d5cfc5b214dc049b743ffbe032ef4
Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
  fast-import: Cleanup mode setting.
  Git.pm: call Error::Simple() properly
fast-import.c
perl/Git.pm