# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1231837257 0
# Node ID 62b41bb71a60e41599a86fd84afa0a61bab61aa6
# Parent  b04508e5cc6cad6fffac2875112f9e8e8a8c1a1f# Parent  7bbac147f2761821a7c148e5000259ebc0576929
merge of '36ce4dcc4d637d6227ef52b2e9e72f957f0435ff'
     and 'fc5fe0f88226b374c4d42d65ed90e97a059f4d0f'

diff -r 7bbac147f276 -r 62b41bb71a60 libpurple/media.c