r3558 - in branches/2.0/varnish-cache: include lib/libvarnish

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-01-28 15:08:32 +0100 (Wed, 28 Jan 2009)
New Revision: 3558

Modified:
   branches/2.0/varnish-cache/include/vsb.h
   branches/2.0/varnish-cache/lib/libvarnish/vsb.c
Log:
Merge r3420:

Update license to remove the advertising clause, reflecting similar change
in the FreeBSD original.

Approved by:    des



Modified: branches/2.0/varnish-cache/include/vsb.h
===================================================================
--- branches/2.0/varnish-cache/include/vsb.h	2009-01-28 14:04:12 UTC (rev 3557)
+++ branches/2.0/varnish-cache/include/vsb.h	2009-01-28 14:08:32 UTC (rev 3558)
@@ -11,8 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Modified: branches/2.0/varnish-cache/lib/libvarnish/vsb.c
===================================================================
--- branches/2.0/varnish-cache/lib/libvarnish/vsb.c	2009-01-28 14:04:12 UTC (rev 3557)
+++ branches/2.0/varnish-cache/lib/libvarnish/vsb.c	2009-01-28 14:08:32 UTC (rev 3558)
@@ -11,8 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES