# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1231849479 0
# Node ID fc921eb8b220aa31dc8a713bebf52d3e72bec28e
# Parent  958a5d614f71023ac22d89d52f28c3407ca873ef# Parent  62b41bb71a60e41599a86fd84afa0a61bab61aa6
merge of 'a38c44e88ee54fa639c5d924a5100699df189a26'
     and 'e72ddc7f90a0fe1fa018263ba764ffa193e330f0'

diff -r 958a5d614f71 -r fc921eb8b220 libpurple/media.c