changeset 26041:68ebba87143b

merge of '403c70a10f0947c6a968f38acae33715ffad2fce' and 'dca923f5c49ff1a1638b3ac1529f82d846737578'
author Marcus Lundblad <ml@update.uu.se>
date Sat, 10 Jan 2009 01:27:48 +0000
parents 8b54456cba97 (current diff) 81e34828a9da (diff)
children 46434dc43a63
files libpurple/media.c pidgin/gtkprefs.c
diffstat 0 files changed, 0 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff