diff pidgin/gtkmedia.c @ 31699:a3bfd9439d37

merge of '974d79cf8eb22b7138c9a3d7313e89585fd8b443' and 'a657534f694305a613db4946ca8ea9ab4c8f1c1d'
author Evan Schoenberg <evan.s@dreskin.net>
date Mon, 21 Feb 2011 22:56:48 +0000
parents 4ce69a55f2c6
children 017b7ff5a894
line wrap: on
line diff