Merge branch 'testing' into moveaccount

2011-01-19 10:41:14 -08:00
parent 2a59453d4c 1d24ece32e
commit 963e7576f2
16 changed files with 176 additions and 108 deletions
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -77,4 +77,5 @@ VALUES
    ('twitvim','TwitVim','http://vim.sourceforge.net/scripts/script.php?script_id=2204', now()),
    ('Updating.Me','Updating.Me','http://updating.me/', now()),
    ('urfastr','urfastr','http://urfastr.net/', now()),
-    ('yatca','Yatca','http://www.yatca.com/', now());
+    ('yatca','Yatca','http://www.yatca.com/', now()),
+    ('rss.me', 'rss.me', 'http://rss.me/', now());