comparison libpurple/plugins/psychic.c @ 27388:07dcbda77127

merge of '0ce6e164761ad4833f620020df5a0194cfea51e0' and '93d4d4f38093494c8d2f98d523b97f686bbac3d7'
author Paul Aurich <paul@darkrain42.org>
date Sat, 04 Jul 2009 22:23:46 +0000
parents 2ab648c328cc
children a8cc50c2279f
comparison
equal deleted inserted replaced
27386:5f62aa791648 27388:07dcbda77127