Mercurial > pidgin
diff libpurple/protocols/jabber/buddy.h @ 26045:62b41bb71a60
merge of '36ce4dcc4d637d6227ef52b2e9e72f957f0435ff'
and 'fc5fe0f88226b374c4d42d65ed90e97a059f4d0f'
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 13 Jan 2009 09:00:57 +0000 |
parents | 1de1494a13e5 |
children | 4d752d07a126 0e8b5b5c497a e9b7e41dc816 5dd25c58b65e 1d3274111180 45c33d60c547 |