comparison pidgin/gtkstatusbox.c @ 32631:84fd9c28e1de

merge of '016f0a7edfb704950358fcccbf5098f0c6f7dac6' and '489939aa338846decb86daa45569479f931422e4'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sun, 18 Sep 2011 09:11:02 +0000
parents e2c6e4fc3c84
children 904686722499
comparison
equal deleted inserted replaced
32630:2ca29cd62db8 32631:84fd9c28e1de