pidgin.mxit: 7d471640: merge of '1752eca840ee38709777126fdc81af...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 7d47164033af43b2b36ed2cd8180d699c8027b6d
Parent:   1752eca840ee38709777126fdc81af5af7763e54
Parent:   62c1402a9d54bdc07737fbefdfeb664eb5f01d81
Author:   andrew.victor at mxit.com
Date:     06/27/11 01:23:59
Branch:   im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/7d47164033af43b2b36ed2cd8180d699c8027b6d

Changelog: 

merge of '1752eca840ee38709777126fdc81af5af7763e54'
     and '62c1402a9d54bdc07737fbefdfeb664eb5f01d81'

Changes against parent 1752eca840ee38709777126fdc81af5af7763e54

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

Changes against parent 62c1402a9d54bdc07737fbefdfeb664eb5f01d81

  patched  ChangeLog