pidgin: 948d8c81: merge of '6f879669a6513a5c40335bbaefe842...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: 948d8c81d2ca8b6a8284f310764c5ee0f394228e
Parent:   6f879669a6513a5c40335bbaefe842389a92b39e
Parent:   7827ad5ca971c169586552a79a046a84a28b60ba
Author:   darkrain42 at pidgin.im
Date:     11/20/10 13:12:13
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/948d8c81d2ca8b6a8284f310764c5ee0f394228e

Changelog: 

merge of '6f879669a6513a5c40335bbaefe842389a92b39e'
     and '7827ad5ca971c169586552a79a046a84a28b60ba'

Changes against parent 6f879669a6513a5c40335bbaefe842389a92b39e

  patched  libpurple/protocols/jabber/jabber.c

Changes against parent 7827ad5ca971c169586552a79a046a84a28b60ba

  patched  po/ca.po