Revision fb4f68838e1a7fabc4b2fad98e58b6e8eaffdbb7

[mshkutkov at soc.pidgin.im]

-----------------------------------------------------------------
Revision: fb4f68838e1a7fabc4b2fad98e58b6e8eaffdbb7
Ancestor: c938b837ad43d4957b0afbb31ffc19bcd2566983
Author: mshkutkov at soc.pidgin.im
Date: 2007-07-09T22:17:50
Branch: im.pidgin.soc.2007.remotelogging

Modified files:
        libpurple/log.c

ChangeLog: 

Fix up merge issues.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: fb4f68838e1a7fabc4b2fad98e58b6e8eaffdbb7.diff
Type: text/x-diff
Size: 1468 bytes
Desc: not available
Url : http://pidgin.im/pipermail/commits/attachments/20070709/efd86944/attachment.diff