diff libpurple/protocols/oscar/encoding.c @ 32816:071a0e568ac5

merge of '688484ce559f68e7d5e5ac8e67cc667f96c3791a' and '9b2b55b0c80013fc7794f6334575fb6b7e9ed5b7'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Thu, 31 May 2012 06:20:22 +0000
parents 52801bade70e
children
line wrap: on
line diff