comparison pidgin.desktop.in @ 23209:bda7c7c4d4b2

merge of 'c6ab942a565a274680983552ced9a21feb5f24a9' and 'f7d017b07571640c01e4ebb88a33ceb638a133bb'
author Will Thompson <will.thompson@collabora.co.uk>
date Mon, 26 May 2008 20:51:10 +0000
parents ed4ea63c0b45
children 394a6c9b592c 1694eb347a78
comparison
equal deleted inserted replaced
23204:1cc810daf355 23209:bda7c7c4d4b2