diff ChangeLog @ 25113:d93578eb7244

merge of '3a9f71b3ea427344c6b6e95c63c3559bef222013' and 'd370f99001126b27ce4cf920e66083b8ff7cd629'
author Justin Rodriguez <ffdragon@soc.pidgin.im>
date Wed, 06 Aug 2008 02:54:39 +0000
parents dd30b4323639
children d82d0791b8f8
line wrap: on
line diff