[dw-free] Merge r2665 onto tip. This should bring us back to one world.

[mark]

[commit: http://hg.dwscoalition.org/dw-free/rev/d1c9cbbd12cc]

Merge r2665 onto tip. This should bring us back to one world.

Files modified:

• bin/maint/captcha.pl
• bin/upgrading/update-db-general.pl
• bin/worker/ljtalk-gm
• cgi-bin/LJ/Captcha.pm
• cgi-bin/LJ/Captcha/Generate.pm
• cgi-bin/LJ/Jabber/LastSeen.pm
• cvs/multicvs.conf
• htdocs/captcha/audio.bml
• htdocs/captcha/image.bml
• htdocs/captcha/index.html
• htdocs/js/jquery/jquery-1.3.2.js
• htdocs/js/jquery/jquery-1.3.2.min.js
• t/jabber-lastseen.t

--------------------------------------------------------------------------------
# Diff is much too large to post, sorry.
--------------------------------------------------------------------------------

Comments

[kareila]

WTF, now the production branch is the active tip again.