Revision 37064abba4819599b4b7ad9b9301856633236f2f

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 37064abba4819599b4b7ad9b9301856633236f2f
Ancestor: 170834fdc3a89a6584a59a36ce1f43914acd3a2c
Ancestor: ef6a11abfc06ebecc3c74e3ab793e47d50125989
Author: rlaager at pidgin.im
Date: 2007-05-19T07:47:16
Branch: im.pidgin.pidgin

Modified files:
        ChangeLog

ChangeLog: 

explicit merge of 'ef6a11abfc06ebecc3c74e3ab793e47d50125989'
              and '170834fdc3a89a6584a59a36ce1f43914acd3a2c'
        to branch 'im.pidgin.pidgin'


To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 37064abba4819599b4b7ad9b9301856633236f2f