commit 60c3ecfe348df7428335408194de069722f9ed5c Merge: 35aede3 0820070 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Tue Aug 30 07:08:06 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache