r2601 - in branches/1.2: . debian

[ssm at projects.linpro.no]

Author: ssm
Date: 2008-03-13 07:00:10 +0100 (Thu, 13 Mar 2008)
New Revision: 2601

Modified:
   branches/1.2/
   branches/1.2/debian/varnish.docs
Log:
Merged revisions 2600 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2600 | ssm | 2008-03-13 06:59:19 +0100 (Thu, 13 Mar 2008) | 1 line
  
  Debian packaging: Do not include the upstream INSTALL file
........



Property changes on: branches/1.2
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246-2255,2270-2271,2288-2291,2296-2297,2299,2304-2305,2307-2309,2311-2312,2315,2317-2319,2321-2327,2329-2330,2337,2357-2359,2361-2364,2366,2374-2382,2384-2386,2404,2414-2415,2426,2432-2434,2444-2445,2453-2461,2467,2492-2505,2520-2524,2545,2563-2579,2581-2583,2586,2588
   + /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246-2255,2270-2271,2288-2291,2296-2297,2299,2304-2305,2307-2309,2311-2312,2315,2317-2319,2321-2327,2329-2330,2337,2357-2359,2361-2364,2366,2374-2382,2384-2386,2404,2414-2415,2426,2432-2434,2444-2445,2453-2461,2467,2492-2505,2520-2524,2545,2563-2579,2581-2583,2586,2588,2600

Modified: branches/1.2/debian/varnish.docs
===================================================================
--- branches/1.2/debian/varnish.docs	2008-03-13 05:59:19 UTC (rev 2600)
+++ branches/1.2/debian/varnish.docs	2008-03-13 06:00:10 UTC (rev 2601)
@@ -1,3 +1,2 @@
 README
-INSTALL
 doc/*.html