pidgin: b9857c32: merge of '28fe114c65c7f5fa3fdc6a89311c37...

[khc at pidgin.im]

----------------------------------------------------------------------
Revision: b9857c32002b782a67b23576214ef33234269032
Parent:   28fe114c65c7f5fa3fdc6a89311c370b76a1c371
Parent:   cc913e6ec579f0d81db827c23a13146779b9ca3c
Author:   khc at pidgin.im
Date:     05/11/11 22:31:25
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b9857c32002b782a67b23576214ef33234269032

Changelog: 

merge of '28fe114c65c7f5fa3fdc6a89311c370b76a1c371'
     and 'cc913e6ec579f0d81db827c23a13146779b9ca3c'

Changes against parent 28fe114c65c7f5fa3fdc6a89311c370b76a1c371

  patched  ChangeLog
  patched  libpurple/media/backend-fs2.c
  patched  libpurple/protocols/oscar/libaim.c
  patched  libpurple/protocols/oscar/libicq.c
  patched  po/ChangeLog

Changes against parent cc913e6ec579f0d81db827c23a13146779b9ca3c

  patched  pidgin/gtkdialogs.c