diff libpurple/mediamanager.c @ 26562:16e2f915e3a0

merge of '331dd310d018e9ecbd997e8af14ebcfc79277318' and 'e3c2e41946f35630cb1b6b8bd96de60cce3c9f40'
author Paul Aurich <paul@darkrain42.org>
date Sun, 12 Apr 2009 22:42:38 +0000
parents 4f2f5659aa0d
children 75b473f216f2
line wrap: on
line diff