commit aea855912ec8e140435e7d5f6604e1c6062faf79 Merge: 0326c20 9831187 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Mon Mar 12 15:42:10 2012 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache