diff pidgin/plugins/history.c @ 30142:2e0dffa155db

merge of '0a2b3d194869ba6d7da504c295d74e41e6a38633' and '81475e0c8a58feff71c5b6f773bb62f7a059fb73'
author Mark Doliner <mark@kingant.net>
date Thu, 15 Apr 2010 00:49:01 +0000
parents ea325948453c
children 1798b24a4fd5
line wrap: on
line diff