diff libpurple/conversation.c @ 20518:4b20ec37460f

explicit merge of '753ac22f1fb1d33ecd437bdc3c63ca4f5bd81514' and 'd3a05f1641322311d88741a6039ceacaecd21977'
author Richard Laager <rlaager@wiktel.com>
date Sun, 16 Sep 2007 18:07:27 +0000
parents 7ea794e7cec3
children 6a0d9fa477d4 eb758ca32ea9
line wrap: on
line diff