# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1231550868 0
# Node ID 68ebba87143b2fa3afaf6d80a18ce7c904597170
# Parent  8b54456cba979e5cecfcdfb2c5babc2f1bcde237# Parent  81e34828a9da50816a6d08a9ed350e1a4c22dd50
merge of '403c70a10f0947c6a968f38acae33715ffad2fce'
     and 'dca923f5c49ff1a1638b3ac1529f82d846737578'

diff -r 8b54456cba97 -r 68ebba87143b libpurple/media.c
diff -r 8b54456cba97 -r 68ebba87143b pidgin/gtkprefs.c