diff libpurple/media.c @ 32288:623a27e62d19

merge of 'c9c5ba486ea016ed8a4454c0f070edfc5af646a9' and 'dbaa022b0a110063e55fdb3a46b07b011f3176e6'
author John Bailey <rekkanoryo@rekkanoryo.org>
date Thu, 17 Mar 2011 01:38:28 +0000
parents ea2a155b4439
children a4ba3b194ce3
line wrap: on
line diff