comparison libpurple/mediamanager.c @ 27119:f3b0232ef1ea

merge of '58446e074cca7b8a7348254c03cfce2c5534fd63' and '80305ffb91d9fc37e61e28c36fdc60fa02826699'
author Paul Aurich <paul@darkrain42.org>
date Fri, 05 Jun 2009 05:44:44 +0000
parents 75b473f216f2
children feb17f2b5b7a
comparison
equal deleted inserted replaced
27118:c3fcdd59ab76 27119:f3b0232ef1ea