commit 96ac6271c5285bdf4c6fd60370139f19384cb36b Merge: c6dd10c 367ce68 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Wed Nov 13 10:09:31 2013 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache