comparison libpurple/status.c @ 31504:00bd105ebe4d

merge of '5cc540d254209e86098cf202fc57169624ae9cee' and 'a76cda57800f3e69f699905c2ea77d992a685dfc'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sun, 19 Dec 2010 22:43:36 +0000
parents a538cb73f897
children f44718de8b06 80eabeb5b794
comparison
equal deleted inserted replaced
31503:008b24923a77 31504:00bd105ebe4d