Merge remote-tracking branch 'origin/master'

2013-05-25 15:13:06 +02:00 · 2013-05-25 15:13:06 +02:00 · 73308f06a7
commit 73308f06a7
parent 091fafefa1 33507c3314
1 changed files with 1 additions and 1 deletions
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@ -1766,7 +1766,7 @@ class PMA_Config
    }

    /**
-     * sets cookie if value is different from current cokkie value,
+     * sets cookie if value is different from current cookie value,
     * or removes if value is equal to default
     *
     * @param string $cookie   name of cookie to remove