commit e7694ea92d0c9e1953b70ea9059fb3cbfe3eb257 Merge: 9857918 4e9bf8c Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Mon Nov 14 16:32:18 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache