commit 3673967c6bf261a2c1e1e8220239c98d71ad7393 Merge: 4c1e826 59a3b91 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Mon Dec 19 10:36:01 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache