Merge branch '0.7.x' into 0.8.x

2009-03-30 15:15:40 +00:00
parent 8c073a34ce 559cf75edb
commit 27b45eeb48
27 changed files with 596 additions and 367 deletions
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -45,4 +45,4 @@ VALUES
    ('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()),
-    ('adium', 'Adium', 'http://www.adiumx.com/', now()));
+    ('adium', 'Adium', 'http://www.adiumx.com/', now());