commit a15dd15d81397489f2b3ac0ad4a1ef835f07b3d2 Merge: acab05e 48345b6 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Mon Jun 18 09:13:38 2012 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache