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

Conflicts: install.php lib/noticeform.php
2009-09-24 17:22:51 -04:00
parent 8284b3cb82 49bce941a9
commit 78cec7ab87
10 changed files with 474 additions and 200 deletions
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -90,7 +90,7 @@ class NoticeForm extends Form
        $this->action  = $action;
        $this->content = $content;
        $this->inreplyto = $inreplyto;
-        
+
        if ($user) {
            $this->user = $user;
        } else {