diff ChangeLog @ 26098:5c3976757e50

merge of '1fa05b8b4d069723f0cba486203a2a00c3baf096' and '9fc1a9e643b3113695eaf212da6cb69b061ef832'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Sat, 10 Jan 2009 01:11:29 +0000
parents a33943427c90
children 1e121a3eceeb 19cd8f986e4a
line wrap: on
line diff