pidgin: 22e8ea4d: merge of '9ffac1a19695cb6a4ed024bc6951ca...

Mon Nov 17 22:05:29 EST 2008

-----------------------------------------------------------------
Revision: 22e8ea4d0d9137e4b03043f93089c752e603c46d
Ancestor: 9ffac1a19695cb6a4ed024bc6951cae029d6daaf
Ancestor: d8c371c48ca198c45ed71c86837ddef903d9f617
Author: rlaager at pidgin.im
Date: 2008-11-18T03:00:54
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/22e8ea4d0d9137e4b03043f93089c752e603c46d

Modified files:
        COPYRIGHT libpurple/notify.h
        libpurple/protocols/jabber/parser.c

ChangeLog: 

merge of '9ffac1a19695cb6a4ed024bc6951cae029d6daaf'
     and 'd8c371c48ca198c45ed71c86837ddef903d9f617'