diff libpurple/server.h @ 31595:f018b3be6d2c

merge of '499902f7613784436d3ab1e47339e2822f695102' and '991beede956f49a172400a1cc3b5784f94a00fba'
author Paul Aurich <paul@darkrain42.org>
date Wed, 11 May 2011 04:35:06 +0000
parents 44f53d3fc54f
children 91e8402106c1
line wrap: on
line diff