merge

doc/contributions.txt

indra/llui/llchatentry.cpp

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llfloaterreg.cpp

indra/newview/app_settings/settings.xml

indra/newview/llchathistory.cpp

indra/newview/llconversationlog.cpp

indra/newview/llconversationlog.h

indra/newview/llconversationloglist.cpp

indra/newview/llconversationview.cpp

indra/newview/llfloaterimcontainer.cpp

indra/newview/llfloaterimcontainer.h

indra/newview/llfloaterimnearbychat.cpp

indra/newview/llfloaterimnearbychat.h

indra/newview/llfloaterimsessiontab.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/lllogchat.cpp

indra/newview/lllogchat.h

indra/newview/llspeakers.cpp