commit 34c1fb12b54260a389912648b4c9444aa50f9261 Merge: 218d4fb 0c9a575 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Fri May 27 08:41:45 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache