# HG changeset patch
# User Etan Reisner <pidgin@unreliablesource.net>
# Date 1250210254 0
# Node ID 25ad8f6b2638fbe540c84c30e04bcc5f03c5d3c8
# Parent  cea56d000b166ce3aac78923e1e16068c85b0f16# Parent  4179ab2cfe1f24c20b754e076d0bbfe341faaa0d
merge of 'ce714031f3cafbcbd99cc3988cbb9cacd3ada236'
     and 'f6ccaee21b84f421b31d614cb5c06c855ab47e0b'

diff -r 4179ab2cfe1f -r 25ad8f6b2638 libpurple/purple-send
--- a/libpurple/purple-send	Fri Aug 14 00:32:23 2009 +0000
+++ b/libpurple/purple-send	Fri Aug 14 00:37:34 2009 +0000
@@ -29,4 +29,3 @@
 shift
 dbus-send --dest=im.pidgin.purple.PurpleService --print-reply --type=method_call /im/pidgin/purple/PurpleObject im.pidgin.purple.PurpleInterface.$METHOD_NAME "$@"
 
-echo 
diff -r 4179ab2cfe1f -r 25ad8f6b2638 libpurple/purple-send-async
--- a/libpurple/purple-send-async	Fri Aug 14 00:32:23 2009 +0000
+++ b/libpurple/purple-send-async	Fri Aug 14 00:37:34 2009 +0000
@@ -27,4 +27,3 @@
 shift
 dbus-send --dest=im.pidgin.purple.PurpleService --type=method_call /im/pidgin/purple/PurpleObject im.pidgin.purple.PurpleInterface.$METHOD_NAME "$@"
 
-echo