merge

indra/llrender/llfontfreetype.h

indra/llrender/llfontgl.cpp

indra/llui/llbutton.cpp

indra/llui/llbutton.h

indra/llui/lldraghandle.cpp

indra/llui/llfloater.cpp

indra/llui/lltabcontainer.cpp

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/llui/lltextbox.cpp

indra/llui/lltexteditor.cpp

indra/llui/lluistring.cpp

indra/llui/lluistring.h

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llchathistory.cpp

indra/newview/llexpandabletextbox.cpp

indra/newview/llinspectobject.cpp

indra/newview/llmaniptranslate.cpp

indra/newview/llmaniptranslate.h