diff pidgin/pidginstock.h @ 22118:8243222c8c1b

merge of '59861e303c2e7d7bfe9c10a06497b1aaa47d6588' and '74122e66cd2ced071a030e5c2b33b64622b2fead'
author Mark Doliner <mark@kingant.net>
date Tue, 15 Jan 2008 17:56:16 +0000
parents 6bf32c9e15a7
children bd25f8c9d94e 92e71f6e10d4
line wrap: on
line diff