commit 3cf4dfdb08fbf29a57d99d334f69dc27fbe63afe Merge: eb7cbda 299d2da Author: Geoff Simmons <geoff at uplex.de> Date: Thu Jan 19 12:33:08 2012 +0100 Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache into experimental-ims