commit a15f37d32766d8a923f67cb0ff98f00240cecc1a Merge: 4c18047 f8dd5cc Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Fri May 6 11:10:20 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache