Mercurial > pidgin.yaz
diff libpurple/protocols/oscar/family_odir.c @ 29780:72b059116c82
merge of 'b88c4f72aa3d87a41d0ae232164801f4e1aeca1a'
and 'bbcf4976b4db49082dcd52239fe155eb95c4ee1a'
author | andrew.victor@mxit.com |
---|---|
date | Mon, 18 Jan 2010 20:41:11 +0000 |
parents | 6e1967b0f90b |
children |