Mercurial > pidgin
diff libpurple/protocols/jabber/buddy.c @ 24945:25aadd8c3ec7
Fix merge.
author | Mike Ruprecht <maiku@soc.pidgin.im> |
---|---|
date | Sun, 19 Oct 2008 04:55:34 +0000 |
parents | 4d752d07a126 |
children |
author | Mike Ruprecht <maiku@soc.pidgin.im> |
---|---|
date | Sun, 19 Oct 2008 04:55:34 +0000 |
parents | 4d752d07a126 |
children |