commit 5ef823824008ab2533d37dca6b99fafae02834cd Merge: 6ee9fa3 6350bfb Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Fri Jan 21 14:58:33 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache