pidgin: d3aa083a: merge of '6655e507da0527cad53500fbed4bf9...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: d3aa083a2594f038a5fd5946e11cfa862d9a4306
Ancestor: 6655e507da0527cad53500fbed4bf9dbcebdbf2c
Ancestor: 6e720023b2bf27dea7ab89e53415f239bfd6a764
Author: darkrain42 at pidgin.im
Date: 2010-05-08T21:19:58
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d3aa083a2594f038a5fd5946e11cfa862d9a4306

Modified files:
        libpurple/network.h po/ca.po

ChangeLog: 

merge of '6655e507da0527cad53500fbed4bf9dbcebdbf2c'
     and '6e720023b2bf27dea7ab89e53415f239bfd6a764'