# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1180417245 0
# Node ID b31f53796f3bda506e160d73323ee130deed6f85
# Parent  837b697723c05b1da6b2d6ed65cbdc991e230103# Parent  7ada026a53b94f6a08c5c8bbe837caaf2fb5789f
merge of '3d155cfe6d5da449233ba5c19a6f5fea1a33467d'
     and '85d3a31151de8461340501f24062fb9e2545dd99'

diff -r 837b697723c0 -r b31f53796f3b pidgin/pixmaps/emotes/default/22/theme
--- a/pidgin/pixmaps/emotes/default/22/theme	Tue May 29 04:56:30 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/22/theme	Tue May 29 05:40:45 2007 +0000
@@ -90,7 +90,7 @@
 good.png            (Y)     (y)
 bad.png             (N)     (n)
 vampire.png         :[      :-[
-#goat.png           (nah)
+goat.png            (nah)
 sun.png             (#)
 rainbow.png         (R)     (r)
 quiet.png           :-#
@@ -122,7 +122,6 @@
 party.png           <:o)
 eyeroll.png         8-)
 yawn.png            |-) 
-goat.png            (nah)
 ! skywalker.png     C:-)    c:-)    C:)     c:)
 ! monkey.png        :-(|)