commit 6cc6f23fe4294dd0e33841a1dafbbe92cecf9874 Merge: 5a7a850 aed74d6 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Wed Nov 23 08:27:05 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache