From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Dec 2010 00:51:08 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: ko-next~73
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2d0123ccb9709410e46f352ff7354e9e0f6427b1;p=git.git

Merge branch 'master' into next

* master:
  Documentation/git.txt: update list of maintenance releases
  t9143: do not fail when unhandled.log.gz is not created
  git-svn: allow the mergeinfo property to be set
---

2d0123ccb9709410e46f352ff7354e9e0f6427b1