commit aa192411a85e0c2cde0cf8954d5668d8639c118f Merge: 95c2094 8336ff8 Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Wed Jun 17 07:54:55 2015 +0000 Merge branch 'master' of git.varnish-cache.org:varnish-cache