pidgin.mxit: 0990b7d9: merge of '2dac05a5983488206ebe3601153bfc...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 0990b7d91cba25c97d386f33c79e396b48f3be40
Parent:   2dac05a5983488206ebe3601153bfca71f925d21
Parent:   c13c35c07888cc787731bd388eb99734c41f67ef
Author:   andrew.victor at mxit.com
Date:     08/16/11 01:56:35
Branch:   im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/0990b7d91cba25c97d386f33c79e396b48f3be40

Changelog: 

merge of '2dac05a5983488206ebe3601153bfca71f925d21'
     and 'c13c35c07888cc787731bd388eb99734c41f67ef'

Changes against parent 2dac05a5983488206ebe3601153bfca71f925d21

  patched  libpurple/protocols/mxit/cipher.c
  patched  libpurple/protocols/mxit/cipher.h
  patched  libpurple/protocols/mxit/mxit.c

Changes against parent c13c35c07888cc787731bd388eb99734c41f67ef

  patched  ChangeLog