Merge branch 'master' into 0.8.x

Conflicts:
	scripts/twitterstatusfetcher.php

1 files changed, 1 insertions, 1 deletions

diff --git a/scripts/twitterstatusfetcher.php b/scripts/twitterstatusfetcher.php
index e2ba1d003..e1745cfc0 100755
--- a/scripts/twitterstatusfetcher.php
+++ b/scripts/twitterstatusfetcher.php
@@ -330,7 +330,7 @@ class TwitterStatusFetcher extends Daemon
             $notice->rendered   = common_render_content($notice->content, $notice);
             $notice->source     = 'twitter';
             $notice->reply_to   = null; // XXX lookup reply
-            $notice->is_local   = NOTICE_GATEWAY;
+            $notice->is_local   = Notice::GATEWAY;
 
             if (Event::handle('StartNoticeSave', array(&$notice))) {
                 $id = $notice->insert();