# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1231854366 0
# Node ID f09107a806085455ccfa3029d7d23b09b27e8a53
# Parent  5d9a97a23d6e0c220702abad2959f00f019380c5# Parent  fc921eb8b220aa31dc8a713bebf52d3e72bec28e
merge of '1c8357244603e0d86b5df08b5df711f916c01347'
     and '38031eda38655d87862feafe0580344c910908b1'

diff -r 5d9a97a23d6e -r f09107a80608 libpurple/media.c