soc.2010.icq-tlc: f743e02d: explicit merge of '7a18137f663908c5d0306...

Sat Jul 31 16:15:44 EDT 2010

----------------------------------------------------------------------
Revision: f743e02d7d617dd5429dd8ed87576873c4b9b9b8
Parent:   7a18137f663908c5d0306e4d79ddb7d953386eab
Parent:   95cf4cb5f40dd40b28b2117b4e01692bce30ce13
Author:   ivan.komarov at soc.pidgin.im
Date:     07/31/10 16:02:10
Branch:   im.pidgin.soc.2010.icq-tlc
URL: http://d.pidgin.im/viewmtn/revision/info/f743e02d7d617dd5429dd8ed87576873c4b9b9b8

Changelog: 

explicit merge of '7a18137f663908c5d0306e4d79ddb7d953386eab'
              and '95cf4cb5f40dd40b28b2117b4e01692bce30ce13'

Changes against parent 7a18137f663908c5d0306e4d79ddb7d953386eab

  patched  libpurple/protocols/oscar/oscar.c

Changes against parent 95cf4cb5f40dd40b28b2117b4e01692bce30ce13

  patched  libpurple/protocols/oscar/bstream.c
  patched  libpurple/protocols/oscar/encoding.c
  patched  libpurple/protocols/oscar/encoding.h
  patched  libpurple/protocols/oscar/oscar.c