pidgin: 26111dc1: merge of '9655e74ffa6d13bf9ad73bdbd432f0...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: 26111dc13de0d23833dde930539d8082c51671c1
Parent:   9655e74ffa6d13bf9ad73bdbd432f003c33cae79
Parent:   e44423f9da531d77c6bc71cbb54f5a9ffc2e1a18
Author:   darkrain42 at pidgin.im
Date:     08/01/10 16:22:57
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/26111dc13de0d23833dde930539d8082c51671c1

Changelog: 

merge of '9655e74ffa6d13bf9ad73bdbd432f003c33cae79'
     and 'e44423f9da531d77c6bc71cbb54f5a9ffc2e1a18'

Changes against parent 9655e74ffa6d13bf9ad73bdbd432f003c33cae79

  patched  ChangeLog
  patched  po/ca.po
  patched  po/nl.po
  patched  po/ru.po

Changes against parent e44423f9da531d77c6bc71cbb54f5a9ffc2e1a18

  patched  libpurple/protocols/yahoo/libymsg.c