comparison pidgin.desktop.in @ 25374:e22bc87b758b

explicit merge of '9a5e549612efd8ca6f60fc57b51a4eee7e32c861' and 'f398f87ffee8b1b11295a0a0138936074c5dff7a'
author Richard Laager <rlaager@wiktel.com>
date Fri, 02 Jan 2009 22:09:40 +0000
parents ed4ea63c0b45
children 394a6c9b592c 1694eb347a78
comparison
equal deleted inserted replaced
24731:295464ae2d2a 25374:e22bc87b758b