Merge remote branch 'origin/master'

2010-06-29 23:54:01 +05:30
parent 34c68f8aad 16ed06531a
commit bcbf327139
11 changed files with 4 additions and 25 deletions
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -2,8 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
 * Set of functions used to run cookie based authentication.
- * Thanks to Piotr Roszatycki <d3xter at users.sourceforge.net> and
- * Dan Wilson who built this patch for the Debian package.
 *
 * @package phpMyAdmin-Auth-Cookie
 * @version $Id$