diff pidgin.desktop.in @ 28003:268f58ce1289

merge of '53b02d9c3c8aa71b13cea90eea22a0b60155dc8c' and '7c150a3616a42da59174d4b392caadb4df5f0d2c'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Wed, 19 Aug 2009 00:41:20 +0000
parents 1694eb347a78
children 281bd8a973d8
line wrap: on
line diff