merge

indra/llui/lllineeditor.cpp

indra/llui/lllineeditor.h

indra/llui/lltexteditor.cpp

indra/llui/lltexteditor.h

indra/llvfs/lldir.cpp

indra/llvfs/lldir.h

indra/newview/app_settings/settings.xml

indra/newview/llautoreplace.cpp

indra/newview/llautoreplace.h

indra/newview/llconversationlog.cpp

indra/newview/llconversationlog.h

indra/newview/llconversationmodel.cpp

indra/newview/llconversationmodel.h

indra/newview/llfloaterconversationlog.cpp

indra/newview/llfloaterconversationlog.h

indra/newview/llfloaterimcontainer.cpp

indra/newview/llfloaterimnearbychat.cpp

indra/newview/llfloaterimnearbychat.h

indra/newview/llfloaterimsession.cpp

indra/newview/llfloaterimsession.h