Merge branch 'refactor-api' of git@gitorious.org:~zcopley/statusnet/zcopleys-clone...

diff --combined lib/router.php
index 370fbe62b580c994e294e5da0b0e2fc12b51d7d3,33b0984738e72c9305071503e3daea0fd787b1a6..d4d5b659cde2cadcc15d7ce9649e212fc7073b32
--- 1/lib/router.php
--- 2/lib/router.php
+++ b/lib/router.php
@@@ -172,6 -172,10 +172,10 @@@ class Route
          $m->connect('notice/new?replyto=:replyto',
                      array('action' => 'newnotice'),
                      array('replyto' => '[A-Za-z0-9_-]+'));
+         $m->connect('notice/new?replyto=:replyto&inreplyto=:inreplyto',
+                     array('action' => 'newnotice'),
+                     array('replyto' => '[A-Za-z0-9_-]+'),
+                     array('inreplyto' => '[0-9]+'));
  
          $m->connect('notice/:notice/file',
              array('action' => 'file'),
@@@ -263,11 -267,11 +267,11 @@@
          // statuses API
  
          $m->connect('api/statuses/friends_timeline.:format',
 -                    array('action' => 'apifriendstimeline',
 +                    array('action' => 'ApiFriendsTimeline',
                            'format' => '(xml|json|rss|atom)'));
  
          $m->connect('api/statuses/friends_timeline/:id.:format',
 -                    array('action' => 'apifriendstimeline',
 +                    array('action' => 'ApiFriendsTimeline',
                            'id' => '[a-zA-Z0-9]+',
                            'format' => '(xml|json|rss|atom)'));