commit e14ddaee5994cb851983a6881afd2c12cad35db8 Merge: 06b74e3 ee1af67 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Mon Oct 29 13:16:49 2012 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache