Merge branch 'master' into next
commitf3988f86f5368178f7bfc023cb75c0f3524745ba
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Jan 2011 18:24:40 +0000 (18 10:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Jan 2011 18:24:40 +0000 (18 10:24 -0800)
tree7cf9980f568335dcca58e0c48876dc56df7dde78
parent63d9aad326986f3c89285282ff7daf0c9bfa8c96
parent60a2e3320f3030d7c1f453a8cadafad7012fd820
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