commit 1f4006e83a3b257c9a604dd40b857d6292608b46 Merge: b50bbd6 b164c06 Author: Dag Haavi Finstad <daghf at varnish-software.com> Date: Mon Jul 16 12:36:15 2012 +0200 Merge branch '3.0' of ssh://git.varnish-cache.org/git/varnish-cache into 3.0