pidgin: a67777bb: merge of 'b1fa9aff4c34ce047c572504619d09...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: a67777bbdbd85acd20e036b6e8e1607410f658e5
Ancestor: b1fa9aff4c34ce047c572504619d09fd47c9d6be
Ancestor: b31c4ffa9418149941920d030ef2a6ea8d16975b
Author: datallah at pidgin.im
Date: 2009-01-09T03:25:05
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a67777bbdbd85acd20e036b6e8e1607410f658e5

Modified files:
        libpurple/protocols/sametime/Makefile.am pidgin/gtkdialogs.c
        po/ChangeLog po/nb.po

ChangeLog: 

merge of 'b1fa9aff4c34ce047c572504619d09fd47c9d6be'
     and 'b31c4ffa9418149941920d030ef2a6ea8d16975b'