Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache

doc/sphinx/tutorial/esi.rst

@@ -48,9 +48,9 @@ For ESI to work you need to activate ESI processing in VCL, like this:::
     sub vcl_fetch {
     	if (req.url == "/test.html") {
            set beresp.do_esi = true; /* Do ESI processing		*/
-           set obj.ttl = 24 h; 	     /* Sets the TTL on the HTML above  */
+           set beresp.ttl = 24 h;    /* Sets the TTL on the HTML above  */
     	} elseif (req.url == "/cgi-bin/date.cgi") {
-           set obj.ttl = 1m;         /* Sets a one minute TTL on	*/
+           set beresp.ttl = 1m;      /* Sets a one minute TTL on	*/
 	       	       	 	     /*  the included object		*/
         }
     }

lib/libjemalloc/Makefile.am

 # See source code comments to avoid memory leaks when enabling MALLOC_MAG.
-#CPPFLAGS := -DMALLOC_PRODUCTION -DMALLOC_MAG
-AM_CPPFLAGS := -DMALLOC_PRODUCTION
+#CPPFLAGS = -DMALLOC_PRODUCTION -DMALLOC_MAG
+AM_CPPFLAGS = -DMALLOC_PRODUCTION
 
 #all: libjemalloc.so.0 libjemalloc_mt.so.0