From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Jan 2011 18:24:40 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: ko-next~11
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f3988f86f5368178f7bfc023cb75c0f3524745ba;p=git.git

Merge branch 'master' into next

* master:
  remote-ext: do not segfault for blank lines
  Documentation/fast-import: capitalize beginning of sentence
  ll-merge: simplify opts == NULL case
---

f3988f86f5368178f7bfc023cb75c0f3524745ba