pidgin: 9b4b74ad: merge of '514b763ddb36f2f1492895fc413c77...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 9b4b74ad94eb77ef347f7575823e65103cae1f85
Parent:   514b763ddb36f2f1492895fc413c7774e3b56b9d
Parent:   54e89ae24cccf07b4297fb599bd7eafade1f5b84
Author:   qulogic at pidgin.im
Date:     08/24/10 01:07:48
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9b4b74ad94eb77ef347f7575823e65103cae1f85

Changelog: 

merge of '514b763ddb36f2f1492895fc413c7774e3b56b9d'
     and '54e89ae24cccf07b4297fb599bd7eafade1f5b84'

Changes against parent 514b763ddb36f2f1492895fc413c7774e3b56b9d

  patched  po/af.po

Changes against parent 54e89ae24cccf07b4297fb599bd7eafade1f5b84

  patched  COPYRIGHT
  patched  libpurple/media/backend-fs2.c
  patched  libpurple/media/codec.c
  patched  libpurple/media/codec.h
  patched  libpurple/media.c
  patched  libpurple/protocols/msn/session.c