diff pidgin/plugins/timestamp_format.c @ 25802:e3bb0bbfa388

Fix merge
author Marcus Lundblad <ml@update.uu.se>
date Tue, 02 Dec 2008 22:55:49 +0000
parents 3cc856ca2338
children 9ec94a37446a
line wrap: on
line diff