pidgin: d00066cd: merge of '6a17707ef96a5fb4dde26e6700ad3e...

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: d00066cd4a288d711bb0d302fc36272c915aab26
Ancestor: 6a17707ef96a5fb4dde26e6700ad3e0d39c40561
Ancestor: cf52f515f41f2668c92606c9ad852fb55460da9c
Author: maiku at pidgin.im
Date: 2009-08-25T09:37:38
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d00066cd4a288d711bb0d302fc36272c915aab26

Modified files:
        ChangeLog libpurple/account.c libpurple/media.c
        pidgin/gtkblist.c pidgin/gtkdialogs.c

ChangeLog: 

merge of '6a17707ef96a5fb4dde26e6700ad3e0d39c40561'
     and 'cf52f515f41f2668c92606c9ad852fb55460da9c'