diff pidgin.desktop.in @ 19562:0a055f917c85

merge of '1247a733923713e275ecb722adf9abc726896c3f' and '26743756292ed5c798a0e97c6983736a95f5b0d2'
author Ethan Blanton <elb@pidgin.im>
date Sat, 01 Sep 2007 02:36:51 +0000
parents ed4ea63c0b45
children 394a6c9b592c 1694eb347a78
line wrap: on
line diff