comparison libpurple/purple-send-async @ 32674:8f2715fc36db

Fix merge problem.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 08 Oct 2011 21:24:14 +0000
parents cea56d000b16
children
comparison
equal deleted inserted replaced
32673:787609e41f20 32674:8f2715fc36db