comparison libpurple/purple-remote @ 25884:212fb65cef7f

explicit merge of 'ba66150a2a1efc5a5cee7204adab69208825630e' and 'ac72bbedc88fef81dfdd1e2a4b2587010a030657'
author Richard Laager <rlaager@wiktel.com>
date Fri, 02 Jan 2009 22:10:31 +0000
parents 821afc095104
children 46c0ca2b7b3b
comparison
equal deleted inserted replaced
25883:e22bc87b758b 25884:212fb65cef7f