Merge branch 'maint'
commitf2665ec9fa42b75d92d0301cff85362836c5729a
authorJunio C Hamano <gitster@pobox.com>
Tue, 4 Jan 2011 19:23:45 +0000 (4 11:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 4 Jan 2011 19:23:45 +0000 (4 11:23 -0800)
tree5f72e3c95b320fa6eb3d9afcec642e3c7dcd1b9a
parent081f84ee9edb1775e5a5495375a93b3bc6727742
parent9d9f5e72dc5959750498acc81b3e2c8ca76ad499
Merge branch 'maint'

* maint:
  gitweb: skip logo in atom feed when there is none
  t9001: Fix test prerequisites
gitweb/gitweb.perl
t/t9001-send-email.sh