Merge branch 'cr/cvsimport-local-zone' into next
commit292f0b458788ab15f9d01d80947ef4950657d5c4
authorJeff King <peff@peff.net>
Sun, 4 Nov 2012 13:16:40 +0000 (4 08:16 -0500)
committerJeff King <peff@peff.net>
Sun, 4 Nov 2012 13:16:40 +0000 (4 08:16 -0500)
tree22be00882b7471dbcb5f1f9c32aacf913f80ef15
parent6b7e1602084580fec66696af8e06d2316b425c65
parentc2b3af0537e0b2c7624913b0f26191e992beb12c
Merge branch 'cr/cvsimport-local-zone' into next

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