diff ChangeLog @ 16549:e87a490968bb

merge of '8038098094432fe9f6d324d1e4aadb8ff1f9e44a' and 'e752600f71cd86301f03b40c317898826c4ee34a'
author Luke Schierer <lschiere@pidgin.im>
date Sat, 28 Apr 2007 00:39:37 +0000
parents 6447865b2d08
children 90184b199e58 1a1e5a68990c
line wrap: on
line diff