diff libpurple/media.c @ 28330:51ba542e05eb

merge of '319a1520a23092d6a84cf888dd358669dd7ba7c3' and 'e692d9b569a972cd784a93d577784b7b96503ee2'
author Paul Aurich <paul@darkrain42.org>
date Tue, 06 Oct 2009 03:34:05 +0000
parents bb06f05c7159
children e0519a0c9f46 c52dbc5503d0 c3b32b027d9d
line wrap: on
line diff