diff pidgin/gtkprefs.c @ 32132:5166e76265ae

merge of '3a12ece5b629e6de76faec79315514e70ccb32bb' and '4fdc7756ef147546eab68685a5d86c4b6db44a11'
author Paul Aurich <paul@darkrain42.org>
date Mon, 20 Jun 2011 05:53:59 +0000
parents 8b434ffd4efc
children 380f530c3f86 e2c6e4fc3c84 3e4b6ffbb551
line wrap: on
line diff