diff pidgin.desktop.in @ 28095:0b3142f3edb4

merge of '6a17707ef96a5fb4dde26e6700ad3e0d39c40561' and 'cf52f515f41f2668c92606c9ad852fb55460da9c'
author maiku@pidgin.im
date Tue, 25 Aug 2009 09:37:38 +0000
parents 1694eb347a78
children 281bd8a973d8
line wrap: on
line diff