Merge branch 'rj/highlight-test-hang'

* rj/highlight-test-hang: gitweb test: fix highlight test hang on Linux Mint

Jonathan Nieder committed Oct 14, 2013 at 16:19 UTC a43948bae9a5c95731f089c14f3379394ff2f380

No changes.