r1436 - in branches/1.0: . etc

[des at projects.linpro.no]

Author: des
Date: 2007-05-16 16:32:47 +0200 (Wed, 16 May 2007)
New Revision: 1436

Modified:
   branches/1.0/
   branches/1.0/etc/Makefile.am
Log:
Merged revisions 1434 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r1434 | des | 2007-05-16 16:29:46 +0200 (Wed, 16 May 2007) | 2 lines
  
  Include zope-plone.vcl in the tarball.
........



Property changes on: branches/1.0
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1315,1359-1387,1394,1399-1421,1424-1432
   + /trunk/varnish-cache:1-1315,1359-1387,1394,1399-1421,1424-1432,1434

Modified: branches/1.0/etc/Makefile.am
===================================================================
--- branches/1.0/etc/Makefile.am	2007-05-16 14:31:46 UTC (rev 1435)
+++ branches/1.0/etc/Makefile.am	2007-05-16 14:32:47 UTC (rev 1436)
@@ -1,3 +1,3 @@
 # $Id: Makefile.am 1426 2007-05-16 09:35:18Z des $
 
-EXTRA_DIST = default.vcl
+EXTRA_DIST = default.vcl zope-plone.vcl