commit 085f6d2dec9c05259f94a8282eac8a118b0e8baa Merge: 8921e99 ab9cec7 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Fri Nov 18 19:03:48 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache