diff libpurple/status.c @ 29551:80724c326423

merge of '25d4fad7d77b9c892b18504c1bdc49e0ecf41a0f' and '758002db4911cba4399db3131f17cff39238db06'
author Marcus Lundblad <ml@update.uu.se>
date Sun, 07 Mar 2010 19:56:38 +0000
parents a538cb73f897
children 80eabeb5b794
line wrap: on
line diff