Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x

Conflicts:

	lib/jabber.php

1 files changed, 3 insertions, 1 deletions

diff --git a/db/notice_source.sql b/db/notice_source.sql
index ea04862e0..76cff1ff8 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -19,6 +19,7 @@ VALUES
     ('identichat','identichat','http://identichat.prosody.im/', now()),
     ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()),
     ('mbpidgin','mbpidgin','http://code.google.com/p/microblog-purple/', now()),
+    ('Mobidentica', 'Mobidentica', 'http://www.substanceofcode.com/software/mobidentica/', now()),
     ('moconica','Moconica','http://moconica.com/', now()),
     ('pocketwit','PockeTwit','http://code.google.com/p/pocketwit/', now()),
     ('posty','Posty','http://spreadingfunkyness.com/posty/', now()),
@@ -43,4 +44,5 @@ VALUES
     ('twittertools','Twitter Tools','http://wordpress.org/extend/plugins/twitter-tools/', now()),
     ('twitux','Twitux','http://live.gnome.org/DanielMorales/Twitux', now()),
     ('twitvim','TwitVim','http://vim.sourceforge.net/scripts/script.php?script_id=2204', now()),
-    ('urfastr','urfastr','http://urfastr.net/', now());
+    ('urfastr','urfastr','http://urfastr.net/', now()),
+    ('adium', 'Adium', 'http://www.adiumx.com/', now()));