diff ChangeLog.win32 @ 25711:a1acca6ff789

merge of '77e249bc561fc09bc5fe8f9c6f8b573701b5d63d' and 'fca38a4d41e1b8322fa295cbfaa98418b980b2a4'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Sat, 19 Jul 2008 03:10:38 +0000
parents ded0a9cf1785
children aaaff38e144f 1452c89e7f05
line wrap: on
line diff