Merge branch 'master' of gitorious.org:statusnet/mainline

This commit is contained in:
Brion Vibber 2010-05-21 14:09:05 -07:00
commit 07ac946717

View File

@ -54,6 +54,7 @@ VALUES
('tr.im','tr.im','http://tr.im/', now()), ('tr.im','tr.im','http://tr.im/', now()),
('triklepost', 'Tricklepost', 'http://github.com/zcopley/tricklepost/tree/master', now()), ('triklepost', 'Tricklepost', 'http://github.com/zcopley/tricklepost/tree/master', now()),
('tweenky','Tweenky','http://beta.tweenky.com/', now()), ('tweenky','Tweenky','http://beta.tweenky.com/', now()),
('TweetDeck', 'TweetDeck', 'http://www.tweetdeck.com/', now()),
('twhirl','Twhirl','http://www.twhirl.org/', now()), ('twhirl','Twhirl','http://www.twhirl.org/', now()),
('twibble','twibble','http://www.twibble.de/', now()), ('twibble','twibble','http://www.twibble.de/', now()),
('Twidge','Twidge','http://software.complete.org/twidge', now()), ('Twidge','Twidge','http://software.complete.org/twidge', now()),