comparison HACKING @ 17108:fb35886b0d85

explicit merge of '4398ffa92e9bb0a16dbede7756a4cbc5dfa96602' and '43627b3c181a468a8dfbf2ce457608f02a014a2b' to branch 'im.pidgin.pidgin'
author Richard Laager <rlaager@wiktel.com>
date Sat, 19 May 2007 07:50:19 +0000
parents d73ee2690376
children
comparison
equal deleted inserted replaced
17107:3034129a10b6 17108:fb35886b0d85