Mercurial > pidgin
diff finch/gntprefs.c @ 25883:e22bc87b758b
explicit merge of '9a5e549612efd8ca6f60fc57b51a4eee7e32c861'
and 'f398f87ffee8b1b11295a0a0138936074c5dff7a'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 02 Jan 2009 22:09:40 +0000 |
parents | c38d72677c8a |
children | f7c5bb2f6623 cc1e35fa774d |