diff libpurple/media.c @ 27619:205267108d6e

merge of '27b0c8383de99fccc9cd6f312ac355f9e4a4d267' and 'd5aa8b561c618705b25a69e3c0aaea812f4abee6'
author Paul Aurich <paul@darkrain42.org>
date Tue, 14 Jul 2009 22:47:52 +0000
parents 5a4451b8fe29
children 60aab59fb35a
line wrap: on
line diff