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

2 files changed, 3 insertions, 3 deletions

diff --git a/classes/File.php b/classes/File.php
index dd0c3227e..e04a9d525 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -99,7 +99,7 @@ class File extends Memcached_DataObject
                 } elseif (is_string($redir_data)) {
                     $redir_url = $redir_data;
                 } else {
-                    throw new ServerException("Cannot process url '$given_url'");
+                    throw new ServerException("Can't process url '$given_url'");
                 }
                 // TODO: max field length
                 if ($redir_url === $given_url || strlen($redir_url) > 255) {
diff --git a/classes/Notice.php b/classes/Notice.php
index 0c54b6b67..32a8b693c 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -680,7 +680,7 @@ class Notice extends Memcached_DataObject
             return Notice::getStreamDirect($qry, $offset, $limit, null, null, $order, null);
         }
 
-        # Get the cache; if we cannot, just go to the DB
+        # Get the cache; if we can't, just go to the DB
 
         $cache = common_memcache();
 
@@ -1364,7 +1364,7 @@ class Notice extends Memcached_DataObject
             }
         }
 
-        // If it's not a "low bandwidth" source (one where you cannot set
+        // If it's not a "low bandwidth" source (one where you can't set
         // a reply_to argument), we return. This is mostly web and API
         // clients.