diff libpurple/proxy.c @ 29678:6cfc9cf2e8cc

merge of '2ac9476396460f68ab147a035f4083121aec9972' and '3ef9bbfad62576f3db5044c28101c08446179946'
author John Bailey <rekkanoryo@rekkanoryo.org>
date Sun, 04 Apr 2010 02:09:19 +0000
parents 0257b8fe21d6
children 9e60e300541a
line wrap: on
line diff