pidgin: 6f0f6551: merge of '88118487bea2cf5120dec21de3377f...

Mon Aug 22 02:12:19 EDT 2011

----------------------------------------------------------------------
Revision: 6f0f65518dbd9cdbb6b41be078c9cd9db3bbea4b
Parent:   88118487bea2cf5120dec21de3377fada185180f
Parent:   ccb72e4a80d5403e1261e3fb8e1bd07f83e92fcd
Author:   markdoliner at pidgin.im
Date:     08/22/11 02:06:07
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/6f0f65518dbd9cdbb6b41be078c9cd9db3bbea4b

Changelog: 

merge of '88118487bea2cf5120dec21de3377fada185180f'
     and 'ccb72e4a80d5403e1261e3fb8e1bd07f83e92fcd'

Changes against parent 88118487bea2cf5120dec21de3377fada185180f

  patched  libpurple/protocols/jabber/buddy.c

Changes against parent ccb72e4a80d5403e1261e3fb8e1bd07f83e92fcd

  patched  libpurple/protocols/jabber/buddy.c