pidgin: a447805f: merge of '3dc30db9c8f1da2d0c574163fe3765...

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: a447805fc4e48cb0552ae9af1d32da562e5c1dff
Ancestor: 3dc30db9c8f1da2d0c574163fe37658d8b26f95d
Ancestor: 8e3f07ee41e0a06ef01e353e2162d8fcf3d6bb33
Author: maiku at pidgin.im
Date: 2009-08-28T07:26:38
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a447805fc4e48cb0552ae9af1d32da562e5c1dff

Modified files:
        libpurple/media.c libpurple/util.c libpurple/util.h

ChangeLog: 

merge of '3dc30db9c8f1da2d0c574163fe37658d8b26f95d'
     and '8e3f07ee41e0a06ef01e353e2162d8fcf3d6bb33'