diff libpurple/media.c @ 31138:d5b710c91104

merge of 'bdb9e04ffa44988c3cb76672342070f9e798772a' and 'e97fa87108d60ea0e2ce4aaeaee31e5967e0b6db'
author John Bailey <rekkanoryo@rekkanoryo.org>
date Mon, 10 Jan 2011 03:30:05 +0000
parents a8cc50c2279f
children ea2a155b4439
line wrap: on
line diff