commit ec14ff3fec9e2e58b684d33fb0be56c79512d153 Merge: 94fe195 1a4915f Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Fri May 27 13:00:05 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache