diff pidgin.desktop.in @ 20511:bced1f19cb1d

explicit merge of '996cf0c57149ba6e1c714ebb1f11d5d4bac8fb68' and 'a50b5c8c98f4e121b414810d37417458e919de79'
author Richard Laager <rlaager@wiktel.com>
date Sun, 16 Sep 2007 18:01:18 +0000
parents ed4ea63c0b45
children 394a6c9b592c 1694eb347a78
line wrap: on
line diff