[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.

[mark]

Yeah, sorry about that. I don't know what happened or why, but we ended up with two branches. I flattened them down (or I think I did) so we had all of the code changes so we could do the code push.

[kareila]

I think it took whichever branch had the most recent changes as the active branch, which at that time was production again. You must have forgotten to do the explicit update to tip that I warned about before pushing new changes.

Thanks for figuring out what happened before the damage got too bad. Hopefully it won't happen again.