commit 7a6a3d71f70e92c82c860c29e2ff645b7cced5bc Merge: 8061a7c f49967a Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Tue Jun 10 11:15:57 2014 +0000 Merge branch 'master' of git.varnish-cache.org:varnish-cache