diff libpurple/server.c @ 31139:365ec0996ca0

merge of '2efa9b7fc41104668975df54e8be8a7171383794' and '88aea2f701d6cff5efc151d40ef06257da67cf3d'
author Paul Aurich <paul@darkrain42.org>
date Mon, 10 Jan 2011 05:20:06 +0000
parents 43d5face5d9b
children 91e8402106c1 3828a61c44da
line wrap: on
line diff