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

2009-11-08 23:33:58 +01:00
parent 5ab709b739 fc5002015b
commit b10f362ede
75 changed files with 7718 additions and 4851 deletions
--- a/scripts/console.php
+++ b/scripts/console.php
@@ -90,7 +90,7 @@ function readline_emulation($prompt)
        if ($retval == 0) {
            return $line;
        } elseif ($retval == 127) {
-            // Could not execute bash even though we thought we saw it.
+            // Couldn't execute bash even though we thought we saw it.
            // Shell probably spit out an error message, sorry :(
            // Fall through to fgets()...
        } else {