Merge branch 'webrick' of git://git.bogomips.org/git-svn
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Aug 2010 16:46:52 +0000 (09:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Aug 2010 16:46:52 +0000 (09:46 -0700)
* 'webrick' of git://git.bogomips.org/git-svn:
instaweb: add access+error logging for WEBrick
instaweb: minimize moving parts for WEBrick
instaweb: fix WEBrick server support

Trivial merge