comparison libpurple/prpl.c @ 31149:4c4482625191

merge of '0d389b1a3f186fbbea57629066032e0fe9b7a47d' and '3e1e394a5c30d86e26a1419fbfbc1af5d31dff09'
author Paul Aurich <paul@darkrain42.org>
date Mon, 17 Jan 2011 22:37:30 +0000
parents a8cc50c2279f
children 2c58de59bd57 3828a61c44da
comparison
equal deleted inserted replaced
31148:84e9eb0ae4d5 31149:4c4482625191