Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Thu, 1 Jun 2006 01:24:45 +0000 (18:24 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 1 Jun 2006 01:24:45 +0000 (18:24 -0700)
commit5f625247ee64276a5ea51359c685be7ddefcfc59
tree21e3269177b075a85e5b8be7f141abb98ce1d6b1
parent5ff6a3269085c5cd425bad9f470d421a8d62f338
parent87840620fd77e39a0df91dc8b8db6cfdb5e4845a
Merge branch 'master' into next

* master:
  send-email: only 'require' instead of 'use' Net::SMTP
  Allow multiple -m options to git-commit.
git-commit.sh