Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x

3 files changed, 4 insertions, 4 deletions

diff --git a/extlib/Auth/OpenID/Consumer.php b/extlib/Auth/OpenID/Consumer.php
index c75ef4c06..500890b65 100644
--- a/extlib/Auth/OpenID/Consumer.php
+++ b/extlib/Auth/OpenID/Consumer.php
@@ -1059,7 +1059,7 @@ class Auth_OpenID_GenericConsumer {
             }
         }
 
-        // Fragments do not influence discovery, so we cannot compare a
+        // Fragments do not influence discovery, so we can't compare a
         // claimed identifier with a fragment to discovered
         // information.
         list($defragged_claimed_id, $_) =
diff --git a/extlib/Auth/OpenID/Discover.php b/extlib/Auth/OpenID/Discover.php
index 9bb3ee357..62aeb1d2b 100644
--- a/extlib/Auth/OpenID/Discover.php
+++ b/extlib/Auth/OpenID/Discover.php
@@ -515,7 +515,7 @@ function Auth_OpenID_discoverXRI($iname, &$fetcher)
 
 function Auth_OpenID_discover($uri, &$fetcher)
 {
-    // If the fetcher (i.e., PHP) doesn't support SSL, we cannot do
+    // If the fetcher (i.e., PHP) doesn't support SSL, we can't do
     // discovery on an HTTPS URL.
     if ($fetcher->isHTTPS($uri) && !$fetcher->supportsSSL()) {
         return array($uri, array());
@@ -527,7 +527,7 @@ function Auth_OpenID_discover($uri, &$fetcher)
         $result = Auth_OpenID_discoverURI($uri, $fetcher);
     }
 
-    // If the fetcher doesn't support SSL, we cannot interact with
+    // If the fetcher doesn't support SSL, we can't interact with
     // HTTPS server URLs; remove those endpoints from the list.
     if (!$fetcher->supportsSSL()) {
         $http_endpoints = array();
diff --git a/extlib/Auth/OpenID/FileStore.php b/extlib/Auth/OpenID/FileStore.php
index d9962e153..29d8d20e7 100644
--- a/extlib/Auth/OpenID/FileStore.php
+++ b/extlib/Auth/OpenID/FileStore.php
@@ -496,7 +496,7 @@ class Auth_OpenID_FileStore extends Auth_OpenID_OpenIDStore {
 
             return true;
         } else {
-            // Could not open directory.
+            // Couldn't open directory.
             return false;
         }
     }