pidgin: 2522b6d1: merge of '2c2401820569b102feeb7ce574b90a...

Fri Aug 28 16:50:40 EDT 2009

-----------------------------------------------------------------
Revision: 2522b6d10ab37688a21384cd630c6e9b9ef32554
Ancestor: 2c2401820569b102feeb7ce574b90abdc6406f99
Ancestor: 59016466b173fa50996ca16d6324a76c63143b12
Author: malu at pidgin.im
Date: 2009-08-28T20:45:57
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2522b6d10ab37688a21384cd630c6e9b9ef32554

Modified files:
        ChangeLog libpurple/media.c
        libpurple/protocols/yahoo/libymsg.c libpurple/util.c
        libpurple/util.h pidgin/gtkdialogs.c pidgin/gtkmedia.c
        po/POTFILES.in po/de.po po/sv.po

ChangeLog: 

merge of '2c2401820569b102feeb7ce574b90abdc6406f99'
     and '59016466b173fa50996ca16d6324a76c63143b12'