Merge branch '0.8.x' into 0.9.x

Conflicts:
	actions/updateprofile.php
	actions/userauthorization.php
	classes/User_group.php
	index.php
	install.php
	lib/accountsettingsaction.php
	lib/logingroupnav.php

1 files changed, 3 insertions, 0 deletions

diff --git a/db/notice_source.sql b/db/notice_source.sql
index 983ea9150..f590d1b97 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -22,6 +22,8 @@ VALUES
     ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()),
     ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()),
     ('LaTwit','LaTwit','http://latwit.mac65.com/', now()),
+    ('LiveTweeter', 'LiveTweeter', 'http://addons.songbirdnest.com/addon/1204', now()),
+    ('livetweeter', 'livetweeter', 'http://addons.songbirdnest.com/addon/1204', now()),
     ('maisha', 'Maisha', 'http://maisha.grango.org/', now()),
     ('mbpidgin','mbpidgin','http://code.google.com/p/microblog-purple/', now()),
     ('Mobidentica', 'Mobidentica', 'http://www.substanceofcode.com/software/mobidentica/', now()),
@@ -34,6 +36,7 @@ VALUES
     ('pocketwit','PockeTwit','http://code.google.com/p/pocketwit/', now()),
     ('posty','Posty','http://spreadingfunkyness.com/posty/', now()),
     ('qtwitter','qTwitter','http://qtwitter.ayoy.net/', now()),
+    ('qwit', 'Qwit', 'http://code.google.com/p/qwit/', now()),
     ('royalewithcheese','Royale With Cheese','http://p.hellyeah.org/', now()),
     ('rssdent','rssdent','http://github.com/zcopley/rssdent/tree/master', now()),
     ('rygh.no','rygh.no','http://rygh.no/', now()),