comparison libpurple/server.c @ 29678:6cfc9cf2e8cc

merge of '2ac9476396460f68ab147a035f4083121aec9972' and '3ef9bbfad62576f3db5044c28101c08446179946'
author John Bailey <rekkanoryo@rekkanoryo.org>
date Sun, 04 Apr 2010 02:09:19 +0000
parents 43d5face5d9b
children 91e8402106c1 3828a61c44da
comparison
equal deleted inserted replaced
29676:c7bfe4f1358e 29678:6cfc9cf2e8cc