changeset 26129:f09107a80608

merge of '1c8357244603e0d86b5df08b5df711f916c01347' and '38031eda38655d87862feafe0580344c910908b1'
author Marcus Lundblad <ml@update.uu.se>
date Tue, 13 Jan 2009 13:46:06 +0000
parents 5d9a97a23d6e (current diff) fc921eb8b220 (diff)
children 525aa65805b9
files libpurple/media.c
diffstat 0 files changed, 0 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff