commit 8152f09f0e4f9a74fbbd5931d027ad93c175fac3 Merge: bf4dbd5 2011a6b Author: Poul-Henning Kamp <phk at FreeBSD.org> Date: Wed Jan 29 09:49:11 2014 +0000 Merge branch 'master' of git.varnish-cache.org:varnish-cache Conflicts: autogen.des