diff pidgin.desktop.in @ 30618:bb835d43f29f

merge of '04b459a0054fec05e338c8cb5cdafb9d3feb12b5' and '4dfc05ac6d6ae070920c029799fb08b7e3b08973'
author Paul Aurich <paul@darkrain42.org>
date Tue, 15 Jun 2010 01:33:28 +0000
parents 281bd8a973d8
children
line wrap: on
line diff