comparison libpurple/privacy.c @ 31120:e9b9d6ba2cff

merge of 'b37e581d0bfe6efa24595ece99a284dd51c08d78' and 'ddda3b9ca9b6cf8b06736f8b59b92683511117df'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sun, 09 Jan 2011 04:54:17 +0000
parents 14ce47859540
children f75041cb3fec
comparison
equal deleted inserted replaced
31114:4b66ef54f6a3 31120:e9b9d6ba2cff