commit 87ae60f887d7b487be548898b64ac8183b797187 Merge: c717971 e13b98c Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Mon Sep 12 07:36:51 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache