commit cbe58e70c2dc7d8c1769dba2df5e3a16a0c4025e Merge: 4f15e16 04fa5d7 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Tue Jun 19 11:34:03 2012 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache