pidgin: 1598502c: merge of '09b81079c02d3b84a6dedbf29d6ce6...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 1598502c8eef19a6e69df8e94362e1422364405f
Parent:   09b81079c02d3b84a6dedbf29d6ce66862c09a71
Parent:   c463e6d46ceeceb09d3030a6c1f6360f7e5a6b40
Author:   qulogic at pidgin.im
Date:     05/06/11 02:31:40
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1598502c8eef19a6e69df8e94362e1422364405f

Changelog: 

merge of '09b81079c02d3b84a6dedbf29d6ce66862c09a71'
     and 'c463e6d46ceeceb09d3030a6c1f6360f7e5a6b40'

Changes against parent 09b81079c02d3b84a6dedbf29d6ce66862c09a71

  patched  finch/gntconv.c
  patched  finch/libgnt/gntcolors.c
  patched  libpurple/protocols/msn/p2p.c
  patched  libpurple/protocols/msn/p2p.h
  patched  libpurple/protocols/msn/tlv.c
  patched  libpurple/protocols/msn/tlv.h
  patched  po/ChangeLog
  patched  po/en_CA.po

Changes against parent c463e6d46ceeceb09d3030a6c1f6360f7e5a6b40

  patched  ChangeLog