pidgin: 844a1666: merge of '54f14206293cad5f17a3d9ac3b90a7...

[rekkanoryo at pidgin.im]

----------------------------------------------------------------------
Revision: 844a16661ee81e4d288d5a4f25c73836444000c4
Parent:   54f14206293cad5f17a3d9ac3b90a79bbc302d28
Parent:   76a3cd649cdc469718a2303b59a04263164ec664
Author:   rekkanoryo at pidgin.im
Date:     02/06/11 22:17:18
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/844a16661ee81e4d288d5a4f25c73836444000c4

Changelog: 

merge of '54f14206293cad5f17a3d9ac3b90a79bbc302d28'
     and '76a3cd649cdc469718a2303b59a04263164ec664'

Changes against parent 54f14206293cad5f17a3d9ac3b90a79bbc302d28

  patched  ChangeLog
  patched  libpurple/conversation.c
  patched  libpurple/protocols/qq/ChangeLog
  patched  libpurple/protocols/qq/buddy_info.c
  patched  libpurple/protocols/qq/buddy_info.h
  patched  libpurple/protocols/qq/buddy_list.c
  patched  libpurple/protocols/qq/buddy_list.h
  patched  libpurple/protocols/qq/buddy_memo.c
  patched  libpurple/protocols/qq/buddy_memo.h
  patched  libpurple/protocols/qq/buddy_opt.c
  patched  libpurple/protocols/qq/buddy_opt.h
  patched  libpurple/protocols/qq/file_trans.c
  patched  libpurple/protocols/qq/file_trans.h
  patched  libpurple/protocols/qq/group.h
  patched  libpurple/protocols/qq/group_im.c
  patched  libpurple/protocols/qq/group_im.h
  patched  libpurple/protocols/qq/group_info.c
  patched  libpurple/protocols/qq/group_info.h
  patched  libpurple/protocols/qq/group_internal.c
  patched  libpurple/protocols/qq/group_internal.h
  patched  libpurple/protocols/qq/group_join.c
  patched  libpurple/protocols/qq/group_join.h
  patched  libpurple/protocols/qq/im.c
  patched  libpurple/protocols/qq/im.h
  patched  libpurple/protocols/qq/qq.c
  patched  libpurple/protocols/qq/qq.h
  patched  libpurple/protocols/qq/qq_base.c
  patched  libpurple/protocols/qq/qq_base.h
  patched  libpurple/protocols/qq/qq_define.c
  patched  libpurple/protocols/qq/qq_define.h
  patched  libpurple/protocols/qq/qq_network.c
  patched  libpurple/protocols/qq/qq_network.h
  patched  libpurple/protocols/qq/qq_process.c
  patched  libpurple/protocols/qq/qq_process.h
  patched  libpurple/protocols/qq/qq_trans.c
  patched  libpurple/protocols/qq/qq_trans.h
  patched  libpurple/protocols/qq/send_file.c
  patched  libpurple/protocols/qq/send_file.h
  patched  libpurple/protocols/qq/utils.c
  patched  libpurple/protocols/qq/utils.h
  patched  po/de.po

Changes against parent 76a3cd649cdc469718a2303b59a04263164ec664

  patched  COPYRIGHT
  patched  ChangeLog
  patched  libpurple/cipher.c