comparison libpurple/status.c @ 31578:38cd00d46b4d

merge of '342a95ba56375edcb99f196a32acfdb530660c2a' and '711a26934550db93abe9d01aa87be20ed8dfe6e8'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 10 Jan 2011 01:17:34 +0000
parents a538cb73f897
children f44718de8b06 80eabeb5b794
comparison
equal deleted inserted replaced
31577:04471fbd3a85 31578:38cd00d46b4d