changeset 26046:fc921eb8b220

merge of 'a38c44e88ee54fa639c5d924a5100699df189a26' and 'e72ddc7f90a0fe1fa018263ba764ffa193e330f0'
author Marcus Lundblad <ml@update.uu.se>
date Tue, 13 Jan 2009 12:24:39 +0000
parents 958a5d614f71 (current diff) 62b41bb71a60 (diff)
children f09107a80608
files libpurple/media.c
diffstat 0 files changed, 0 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff