From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 4 Oct 2009 21:48:51 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.5-rc3~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a7aebb9d00332364411e85c703cc25dc0580f2d4;p=git.git

Merge branch 'maint'

* maint:
  show-branch: fix segfault when showbranch.default exists
---

a7aebb9d00332364411e85c703cc25dc0580f2d4