diff libpurple/server.h @ 30096:8de1ce16087c

merge of '1f6b3e2158dd96486ec32995b3f4f93d6b376780' and '84c7f6ba2f4be4be1e1698201fae77872ac21fee'
author Daniel Atallah <daniel.atallah@gmail.com>
date Wed, 26 May 2010 13:50:08 +0000
parents e37f85160784
children 44f53d3fc54f
line wrap: on
line diff