Merge branch 'cr/cvsimport-local-zone'
commita2055c28eefd1bc2bb4997276d809ee3d3436a50
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Nov 2012 18:24:09 +0000 (15 10:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Nov 2012 18:24:09 +0000 (15 10:24 -0800)
tree0731dcefa04a916d7fb9ba70caef3ee834dda084
parent6b8731258d06001217254ef67a3553d3fe601737
parentc2b3af0537e0b2c7624913b0f26191e992beb12c
Merge branch 'cr/cvsimport-local-zone'

Allows "cvsimport" to read per-author timezone from the author info
file.

* cr/cvsimport-local-zone:
  cvsimport: work around perl tzset issue
  git-cvsimport: allow author-specific timezones