From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Fri, 13 May 2016 20:32:05 +0000 (+0200)
Subject: Merge branch 'master' of ansgar.seatribe.se:/usr/local/src/pdm
X-Git-Url: http://dolda2000.com/gitweb/?p=pdm.git;a=commitdiff_plain;h=HEAD;hp=d14461c753bd6e14e8299500ecd195bd5f7923e0

Merge branch 'master' of ansgar.seatribe.se:/usr/local/src/pdm
---

diff --git a/pdm/cli.py b/pdm/cli.py
index 667e2ed..7cfa263 100644
--- a/pdm/cli.py
+++ b/pdm/cli.py
@@ -324,7 +324,7 @@ class perfclient(client):
         used by the server process.
 
         The proxy objects returned by this function are cached and the
-        same object are returned the next time the same name is
+        same object is returned the next time the same name is
         requested, which means that they are kept live until the
         client connection is closed.
         """