commit f2d9ff1d74c6ddda36e0e313a120961ae599bf80 Merge: 60c3ecf a600a23 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Tue Aug 30 07:08:26 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache