From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Jan 2009 06:29:37 +0000 (-0800)
Subject: Merge git://git.bogomips.org/git-svn
X-Git-Tag: v1.6.2-rc0~128
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9003dd40272e556288129272655e654bd33e6fa5;p=git.git

Merge git://git.bogomips.org/git-svn

* git://git.bogomips.org/git-svn:
  git-svn: Show UUID in svn info for added directories with svn 1.5.5
  git-svn: avoid importing nested git repos
  git-svn: fix SVN 1.1.x compatibility
  git-svn: Add --localtime option to "fetch"
  git-svn: better attempt to handle broken symlink updates
  git-svn: handle empty files marked as symlinks in SVN
---

9003dd40272e556288129272655e654bd33e6fa5