Merge branch 'testing' into 0.9.x

Conflicts: lib/iomaster.php
2010-02-16 09:25:09 -08:00
parent d4f6235d7b 81b6b58e33
commit d5cbfe8071
54 changed files with 1731 additions and 538 deletions
--- a/lib/api.php
+++ b/lib/api.php
@@ -1155,7 +1155,6 @@ class ApiAction extends Action
        $this->elementStart('feed', array('xmlns' => 'http://www.w3.org/2005/Atom',
                                          'xml:lang' => 'en-US',
                                          'xmlns:thr' => 'http://purl.org/syndication/thread/1.0'));
-        Event::handle('StartApiAtom', array($this));
    }

    function endTwitterAtom()