comparison pidgin.desktop.in @ 25887:47540809ae91

explicit merge of '82e4edbe06cb0ef0fa59f70db44a289bb91e1343' and '8edc2ac791e936a5d9eddd85e451d25e1afa5ba6'
author Richard Laager <rlaager@wiktel.com>
date Fri, 02 Jan 2009 22:23:19 +0000
parents ed4ea63c0b45
children 394a6c9b592c 1694eb347a78
comparison
equal deleted inserted replaced
24804:29931785a68a 25887:47540809ae91