diff pidgin/gaimstock.c @ 15716:557f37189a96

merge of '1e97f0047cd3e2b4639f29469969dc699089ba1c' and '6ca4886aaa96a71d75d8db18c3c591cc3312c08f'
author Evan Schoenberg <evan.s@dreskin.net>
date Sun, 25 Feb 2007 23:52:12 +0000
parents 1229a0cd9126
children 2a673784fa56
line wrap: on
line diff