Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/pep.c @ 24027:d9d31ff2e7f8
merge of 'b341289e9194564cc4f7250228a66b854c2ec3c5'
and 'd566b6f77a48d607fad872411a4fcd2d9f86c558'
author | Kevin Stange <kevin@simguy.net> |
---|---|
date | Thu, 11 Sep 2008 20:26:21 +0000 |
parents | 680a3aea5eb6 |
children | aaaff38e144f 4caae7801f4d 26eabe8e739b |