svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into release

doc/contributions.txt

indra/llrender/llfontgl.cpp

indra/llrender/llfontgl.h

indra/llui/llbutton.cpp

indra/llui/lldraghandle.cpp

indra/llui/llfloater.cpp

indra/llui/llmenugl.cpp

indra/llui/lltextbox.cpp

indra/llui/lltextbox.h

indra/llwindow/llwindowwin32.cpp

indra/newview/llfloatertos.cpp

indra/newview/llnetmap.cpp

indra/newview/llpanelcontents.cpp

indra/newview/llpreviewscript.cpp

indra/newview/llviewermessage.cpp

indra/newview/llviewerwindow.cpp

indra/newview/llworldmapview.cpp

indra/test/llhttpclient_tut.cpp

indra/test/lltut.cpp