Merge pull request #192 from cclauss/patch-2

Fix typo discovered by codespell

Author: linsomniac

ChangeLog

@@ -373,7 +373,7 @@ Sat, 31 May 2008 02:09:17 -0600  Sean Reifschneider  <[email protected]>
 
    *  Paul Hummer set up a Launchpad project which I'm going to start using
       to track patches and allow users to set up their own bzr branches and
-      manage marging in the upstream patches with their own.
+      manage merging in the upstream patches with their own.
 
          https://launchpad.net/python-memcached
 

memcache.py

@@ -728,11 +728,11 @@ def set(self, key, val, time=0, min_compress_len=0, noreply=False):
         @return: Nonzero on success.
         @rtype: int
 
-        @param time: Tells memcached the time which this value should
+        @param time: Tells memcached the time at which this value should
         expire, either as a delta number of seconds, or an absolute
         unix time-since-the-epoch value. See the memcached protocol
         docs section "Storage Commands" for more info on <exptime>. We
-        default to 0 == cache forever. Optionnaly now accepts a timedelta.
+        default to 0 == cache forever. Optionally now accepts a timedelta.
 
         @param min_compress_len: The threshold length to kick in
         auto-compression of the value using the compressor