diff libpurple/mediamanager.c @ 26112:1fa62c559a78

merge of 'd47b8ff41e04be89d7152ac8f587e633fff7c1cb' and 'e6e2272c5b1e49a6ee2565437cd3d6b8963085c9'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Thu, 19 Feb 2009 11:28:01 +0000
parents 76104100cb87
children 730e760ca39f
line wrap: on
line diff