commit e13e923d6738bc588e44bb5757821a8c880a599f Merge: 369b5b6 b231cf2 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Mon Aug 15 08:39:09 2011 +0000 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache