Merge changes from CUPS 1.4svn-r7961.

[thirdparty/cups.git] / conf / cupsd.conf.in

diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index 9eff1e0e700e7574615c240aa3adfa09edf852f1..ff034ccb2419e8b63fb4bc0d608f421b120cfec9 100644 (file)
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -1,5 +1,5 @@
 #
-# "$Id: cupsd.conf.in 7680 2008-06-20 17:37:43Z mike $"
+# "$Id: cupsd.conf.in 7888 2008-08-29 21:16:56Z mike $"
 #
 #   Sample configuration file for the Common UNIX Printing System (CUPS)
 #   scheduler.  See "man cupsd.conf" for a complete description of this
@@ -120,5 +120,5 @@ DefaultAuthType Basic
 </Policy>
 
 #
-# End of "$Id: cupsd.conf.in 7680 2008-06-20 17:37:43Z mike $".
+# End of "$Id: cupsd.conf.in 7888 2008-08-29 21:16:56Z mike $".
 #