pidgin: 4f66d455: merge of '2f76f01c0ca7594f3efba9430e8de0...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 4f66d4552eeef732b012d68b89ea95e2974d13f7
Ancestor: 2f76f01c0ca7594f3efba9430e8de027252c3fd0
Ancestor: 4543673d65f212baabcd1140a9f7394b033db0ec
Author: nosnilmot at pidgin.im
Date: 2008-05-16T03:02:31
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4f66d4552eeef732b012d68b89ea95e2974d13f7

Modified files:
        ChangeLog libpurple/prefs.h
        libpurple/protocols/jabber/chat.c po/ChangeLog

ChangeLog: 

merge of '2f76f01c0ca7594f3efba9430e8de027252c3fd0'
     and '4543673d65f212baabcd1140a9f7394b033db0ec'