Merge branch 'master' into next
authorShawn O. Pearce <spearce@spearce.org>
Fri, 25 Sep 2009 23:46:21 +0000 (16:46 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Fri, 25 Sep 2009 23:46:21 +0000 (16:46 -0700)
commit452d677f7b00a7f53ae0d2e78312e63cc89e2387
treee994b969d17c614065f1d2511a2d1417013c114a
parenta9dd6c4e8ab38f5c4af9c0710381d3844f1d904f
parentfb3650ed100a549f80d822f28ccf0f82e9f75f3e
Merge branch 'master' into next

* master:
  send-email: fix obscure error when encryption=tls and smtp cannot connect
  bash: teach 'git checkout' options
  perl/Makefile.PL: detect MakeMaker versions incompatible with DESTDIR
git-send-email.perl