pidgin: f3e5e3ff: merge of '3d06a17dd5bf8095f142141e395986...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: f3e5e3ff81060137ebde7cf6d19ee15f5b8822b1
Parent:   3d06a17dd5bf8095f142141e395986dda870cfe6
Parent:   f34878b425fc3e5501d82254e87d1d9271470428
Author:   qulogic at pidgin.im
Date:     11/21/10 22:04:17
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f3e5e3ff81060137ebde7cf6d19ee15f5b8822b1

Changelog: 

merge of '3d06a17dd5bf8095f142141e395986dda870cfe6'
     and 'f34878b425fc3e5501d82254e87d1d9271470428'

Changes against parent 3d06a17dd5bf8095f142141e395986dda870cfe6

  patched  ChangeLog
  patched  ChangeLog.API
  patched  NEWS
  patched  configure.ac
  patched  libpurple/protocols/oscar/visibility.c
  patched  pidgin/gtkmedia.c
  patched  po/ChangeLog
  patched  po/bn.po
  patched  po/cs.po
  patched  po/es.po
  patched  po/nl.po
  patched  po/nn.po
  patched  po/pl.po
  patched  po/ro.po
  patched  po/sq.po
  patched  po/uk.po
  patched  po/zh_HK.po
  patched  po/zh_TW.po

Changes against parent f34878b425fc3e5501d82254e87d1d9271470428

  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/slplink.c
  patched  libpurple/protocols/msn/slpmsg.c
  patched  libpurple/protocols/msn/slpmsg.h
  patched  libpurple/protocols/msn/slpmsg_part.c