commit 1fbff541f44cda7b9c3bd07739372099bc8df9e5 Merge: 0a96b48 b70a93c Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Tue Jan 3 18:11:00 2012 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache